Fix flaky action tests.

adcoelho · adcoelho · commit c8f69bbcf18b · 2026-04-01T11:42:24.000+02:00
diff --git a/x-pack/platform/test/api_integration_deployment_agnostic/apis/alerting_v2/bulk_create_alert_action.ts b/x-pack/platform/test/api_integration_deployment_agnostic/apis/alerting_v2/bulk_create_alert_action.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import type { DeploymentAgnosticFtrProviderContext } from '../../ftr_provider_context';
 import type { RoleCredentials } from '../../services';
-import { createAlertEvent, indexAlertEvents } from './fixtures';
+import { createAlertEvent, DISPATCHER_SYSTEM_ACTION_TYPES, indexAlertEvents } from './fixtures';
 
 const BULK_ALERT_ACTION_API_PATH = '/api/alerting/v2/alerts/action/_bulk';
 const ALERTING_EVENTS_INDEX = '.rule-events';
@@ -59,7 +59,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
         index: ALERTING_ACTIONS_INDEX,
         query: {
           bool: {
-            must_not: [{ terms: { action_type: ['fire', 'suppress'] } }],
+            must_not: [{ terms: { action_type: [...DISPATCHER_SYSTEM_ACTION_TYPES] } }],
             filter: [{ terms: { rule_id: ruleIds } }],
           },
         },
diff --git a/x-pack/platform/test/api_integration_deployment_agnostic/apis/alerting_v2/create_alert_action.ts b/x-pack/platform/test/api_integration_deployment_agnostic/apis/alerting_v2/create_alert_action.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import type { DeploymentAgnosticFtrProviderContext } from '../../ftr_provider_context';
 import type { RoleCredentials } from '../../services';
-import { createAlertEvent, indexAlertEvents } from './fixtures';
+import { createAlertEvent, DISPATCHER_SYSTEM_ACTION_TYPES, indexAlertEvents } from './fixtures';
 
 const ALERT_ACTION_API_PATH = '/api/alerting/v2/alerts';
 const ALERTING_EVENTS_INDEX = '.rule-events';
@@ -59,7 +59,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
         index: ALERTING_ACTIONS_INDEX,
         query: {
           bool: {
-            must_not: [{ terms: { action_type: ['fire', 'suppress'] } }],
+            must_not: [{ terms: { action_type: [...DISPATCHER_SYSTEM_ACTION_TYPES] } }],
             filter: [{ terms: { rule_id: ruleIds } }],
           },
         },
diff --git a/x-pack/platform/test/api_integration_deployment_agnostic/apis/alerting_v2/fixtures/dispatcher_action_types.ts b/x-pack/platform/test/api_integration_deployment_agnostic/apis/alerting_v2/fixtures/dispatcher_action_types.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/**
+ * Action types written by the alerting v2 dispatcher (store_actions_step).
+ * Tests index alert events into `.rule-events`; the scheduled dispatcher task can
+ * index these alongside user/API actions. Queries that pick "latest" user action
+ * must exclude these or flakily observe `unmatched` / `notified` instead of e.g. `activate`.
+ */
+export const DISPATCHER_SYSTEM_ACTION_TYPES = [
+  'fire',
+  'suppress',
+  'unmatched',
+  'notified',
+] as const;
diff --git a/x-pack/platform/test/api_integration_deployment_agnostic/apis/alerting_v2/fixtures/index.ts b/x-pack/platform/test/api_integration_deployment_agnostic/apis/alerting_v2/fixtures/index.ts
@@ -6,3 +6,4 @@
  */
 
 export { createAlertEvent, indexAlertEvents } from './alert_event';
+export { DISPATCHER_SYSTEM_ACTION_TYPES } from './dispatcher_action_types';

Original file line number	Diff line number	Diff line change
`@@ -6,3 +6,4 @@`
`6`	`6`	`*/`
`7`	`7`
`8`	`8`	`export { createAlertEvent, indexAlertEvents } from './alert_event';`
	`9`	`+export { DISPATCHER_SYSTEM_ACTION_TYPES } from './dispatcher_action_types';`