remove triggers.elastic. prefix from workflow triggers (elastic#232026)

talboren · qn895 · commit 81e6ac325161 · 2025-08-26T13:02:17.000-05:00
title
diff --git a/examples/workflows/public/components/app.tsx b/examples/workflows/public/components/app.tsx
@@ -65,7 +65,7 @@ workflow:
   name: New workflow
   enabled: false
   triggers:
-    - type: triggers.elastic.manual
+    - type: manual
   steps:
     - name: step-with-console-log-1
       type: console
diff --git a/src/platform/packages/shared/kbn-workflows/spec/examples/basic.yml b/src/platform/packages/shared/kbn-workflows/spec/examples/basic.yml
@@ -5,11 +5,11 @@ workflow:
   description: 'Remind users to enroll in JAMF'
   enabled: true
   triggers:
-    - type: triggers.elastic.scheduled
+    - type: scheduled
       with:
         every: 1
         unit: day
-    - type: triggers.elastic.manual
+    - type: manual
   inputs:
   consts:
     - name: jamf-server-url
diff --git a/src/platform/packages/shared/kbn-workflows/spec/examples/example_merge.yml b/src/platform/packages/shared/kbn-workflows/spec/examples/example_merge.yml
@@ -4,7 +4,7 @@ workflow:
   description: "Investigate a reported phishing email with parallel analysis and AI summary."
   enabled: true
   triggers:
-    - type: triggers.elastic.manual
+    - type: manual
   steps:
     - name: Parallel analysis
       type: parallel
diff --git a/src/platform/packages/shared/kbn-workflows/spec/examples/example_nesting.yml b/src/platform/packages/shared/kbn-workflows/spec/examples/example_nesting.yml
@@ -4,11 +4,11 @@ workflow:
   description: "Handle alerts based on maliciousness"
   enabled: true
   triggers:
-    - type: triggers.elastic.scheduled
+    - type: scheduled
       with:
         every: 1
         unit: day
-    - type: triggers.elastic.manual
+    - type: manual
   steps:
     - name: Check if alert is malicious
       type: if
diff --git a/src/platform/packages/shared/kbn-workflows/spec/examples/example_on_failure.yml b/src/platform/packages/shared/kbn-workflows/spec/examples/example_on_failure.yml
@@ -4,11 +4,11 @@ workflow:
   version: 1
   enabled: true
   triggers:
-    - type: triggers.elastic.scheduled
+    - type: scheduled
       with:
         every: 1
         unit: day
-    - type: triggers.elastic.manual
+    - type: manual
   steps:
     - name: AI Summary
       type: openai.completion
diff --git a/src/platform/packages/shared/kbn-workflows/spec/examples/example_pishing_from_wireframes.yml b/src/platform/packages/shared/kbn-workflows/spec/examples/example_pishing_from_wireframes.yml
@@ -4,7 +4,7 @@ workflow:
   description: "Workflow to detect if an alert is a real pishing attempt or not"
   enabled: true
   triggers:
-    - type: triggers.elastic.detectionRule
+    - type: alert
       with:
         rule_name: "Email Reported by User as ..."
   steps:
diff --git a/src/platform/packages/shared/kbn-workflows/spec/schema.ts b/src/platform/packages/shared/kbn-workflows/spec/schema.ts
@@ -26,8 +26,8 @@ export const WorkflowSettingsSchema = z.object({
 });
 
 /* --- Triggers --- */
-export const DetectionRuleTriggerSchema = z.object({
-  type: z.literal('triggers.elastic.detectionRule'),
+export const AlertRuleTriggerSchema = z.object({
+  type: z.literal('alert'),
   enabled: z.boolean().optional().default(true),
   with: z.union([
     z.object({ rule_id: z.string().min(1) }),
@@ -36,7 +36,7 @@ export const DetectionRuleTriggerSchema = z.object({
 });
 
 export const ScheduledTriggerSchema = z.object({
-  type: z.literal('triggers.elastic.scheduled'),
+  type: z.literal('scheduled'),
   enabled: z.boolean().optional().default(true),
   with: z.union([
     z.object({
@@ -48,12 +48,12 @@ export const ScheduledTriggerSchema = z.object({
 });
 
 export const ManualTriggerSchema = z.object({
-  type: z.literal('triggers.elastic.manual'),
+  type: z.literal('manual'),
   enabled: z.boolean().optional().default(true),
 });
 
 export const TriggerSchema = z.discriminatedUnion('type', [
-  DetectionRuleTriggerSchema,
+  AlertRuleTriggerSchema,
   ScheduledTriggerSchema,
   ManualTriggerSchema,
 ]);
diff --git a/src/platform/plugins/shared/workflows_management/public/entities/workflows/lib/get_workflow_graph.test.ts b/src/platform/plugins/shared/workflows_management/public/entities/workflows/lib/get_workflow_graph.test.ts
@@ -17,7 +17,7 @@ describe('getWorkflowGraph', () => {
       enabled: true,
       triggers: [
         {
-          type: 'triggers.elastic.manual' as const,
+          type: 'manual' as const,
           enabled: true,
         },
       ],
@@ -36,10 +36,10 @@ describe('getWorkflowGraph', () => {
     expect(workflowGraph.nodes().length).toBe(2);
     expect(workflowGraph.edges().length).toBe(1);
 
-    expect(workflowGraph.node('triggers.elastic.manual').type).toBe('trigger');
+    expect(workflowGraph.node('manual').type).toBe('trigger');
     expect(workflowGraph.node('first-step').type).toBe('action');
 
-    expect(workflowGraph.hasEdge('triggers.elastic.manual', 'first-step')).toBe(true);
+    expect(workflowGraph.hasEdge('manual', 'first-step')).toBe(true);
   });
 
   it('should return the correct graph with a nested step', () => {
@@ -49,7 +49,7 @@ describe('getWorkflowGraph', () => {
       enabled: true,
       triggers: [
         {
-          type: 'triggers.elastic.manual' as const,
+          type: 'manual' as const,
           enabled: true,
         },
       ],
@@ -91,13 +91,13 @@ describe('getWorkflowGraph', () => {
     expect(workflowGraph.nodes().length).toBe(5);
     expect(workflowGraph.edges().length).toBe(4);
 
-    expect(workflowGraph.node('triggers.elastic.manual').type).toBe('trigger');
+    expect(workflowGraph.node('manual').type).toBe('trigger');
     expect(workflowGraph.node('first-step').type).toBe('action');
     expect(workflowGraph.node('if-split').type).toBe('if');
     expect(workflowGraph.node('if-true').type).toBe('action');
     expect(workflowGraph.node('if-false').type).toBe('action');
 
-    expect(workflowGraph.hasEdge('triggers.elastic.manual', 'first-step')).toBe(true);
+    expect(workflowGraph.hasEdge('manual', 'first-step')).toBe(true);
     expect(workflowGraph.hasEdge('first-step', 'if-split')).toBe(true);
     expect(workflowGraph.hasEdge('if-split', 'if-true')).toBe(true);
     expect(workflowGraph.hasEdge('if-split', 'if-false')).toBe(true);
diff --git a/src/platform/plugins/shared/workflows_management/public/entities/workflows/lib/get_workflow_graph.ts b/src/platform/plugins/shared/workflows_management/public/entities/workflows/lib/get_workflow_graph.ts
@@ -9,6 +9,7 @@
 
 import { graphlib } from '@dagrejs/dagre';
 import type { WorkflowYaml } from '@kbn/workflows';
+import { getTriggerLabel } from '../../../shared/lib/graph_utils';
 
 export type WorkflowGraphNodeType =
   | 'if'
@@ -31,19 +32,6 @@ export type WorkflowGraph = graphlib.Graph<WorkflowGraphNodeLabel>;
 
 export const flowNodeTypes = ['if', 'merge', 'parallel', 'foreach', 'atomic', 'merge', 'trigger'];
 
-function getTriggerLabel(triggerType: string) {
-  switch (triggerType) {
-    case 'triggers.elastic.manual':
-      return 'Manual';
-    case 'triggers.elastic.detectionRule':
-      return 'Detection Rule';
-    case 'triggers.elastic.scheduled':
-      return 'Scheduled';
-    default:
-      return triggerType;
-  }
-}
-
 function transformYamlToNodesAndEdges(
   triggers: WorkflowYaml['triggers'],
   steps: WorkflowYaml['steps']
diff --git a/src/platform/plugins/shared/workflows_management/public/features/workflow_context/lib/get_context_for_path.test.ts b/src/platform/plugins/shared/workflows_management/public/features/workflow_context/lib/get_context_for_path.test.ts
@@ -21,7 +21,7 @@ describe('getContextSchemaForPath', () => {
     enabled: true,
     triggers: [
       {
-        type: 'triggers.elastic.manual' as const,
+        type: 'manual' as const,
         enabled: true,
       },
     ],
diff --git a/src/platform/plugins/shared/workflows_management/public/features/workflow_visual_editor/lib/get_layouted_nodes_and_edges.ts b/src/platform/plugins/shared/workflows_management/public/features/workflow_visual_editor/lib/get_layouted_nodes_and_edges.ts
@@ -10,24 +10,12 @@
 import dagre, { graphlib } from '@dagrejs/dagre';
 import type { WorkflowYaml } from '@kbn/workflows';
 import { Position } from '@xyflow/react';
+import { getTriggerLabel } from '../../../shared/lib/graph_utils';
 
 export type NodeType = 'if' | 'merge' | 'parallel' | 'action' | 'foreach' | 'atomic' | 'trigger';
 
 export const flowNodeTypes = ['if', 'merge', 'parallel', 'foreach', 'atomic', 'merge', 'trigger'];
 
-function getTriggerLabel(triggerType: string) {
-  switch (triggerType) {
-    case 'triggers.elastic.manual':
-      return 'Manual';
-    case 'triggers.elastic.detectionRule':
-      return 'Detection Rule';
-    case 'triggers.elastic.scheduled':
-      return 'Scheduled';
-    default:
-      return triggerType;
-  }
-}
-
 export function transformYamlToNodesAndEdges(
   triggers: WorkflowYaml['triggers'],
   steps: WorkflowYaml['steps']
diff --git a/src/platform/plugins/shared/workflows_management/public/features/workflow_visual_editor/ui/workflow_node.tsx b/src/platform/plugins/shared/workflows_management/public/features/workflow_visual_editor/ui/workflow_node.tsx
@@ -17,11 +17,7 @@ import React from 'react';
 import type { NodeType } from '../lib/get_layouted_nodes_and_edges';
 import { flowNodeTypes } from '../lib/get_layouted_nodes_and_edges';
 
-const triggerNodeTypes = [
-  'triggers.elastic.manual',
-  'triggers.elastic.detectionRule',
-  'triggers.elastic.scheduled',
-];
+const triggerNodeTypes = ['manual', 'alert', 'scheduled'];
 const actionNodeTypes = ['console', 'slack', 'delay', 'inference.unified_inference'];
 
 function getNodeIcon(nodeType: string, color: string) {
@@ -36,11 +32,11 @@ function getNodeIcon(nodeType: string, color: string) {
       return <EuiIcon type="logoSlack" color={color} />;
     case 'inference.unified_inference':
       return <EuiIcon type="sparkles" color={color} />;
-    case 'triggers.elastic.manual':
+    case 'manual':
       return <EuiIcon type="accessibility" color={color} />;
-    case 'triggers.elastic.detectionRule':
+    case 'alert':
       return <EuiIcon type="warning" color={color} />;
-    case 'triggers.elastic.scheduled':
+    case 'scheduled':
       return <EuiIcon type="clock" color={color} />;
     case 'delay':
       return <EuiIcon type="clock" color={color} />;
diff --git a/src/platform/plugins/shared/workflows_management/public/pages/workflows/index.tsx b/src/platform/plugins/shared/workflows_management/public/pages/workflows/index.tsx
@@ -19,7 +19,7 @@ import { WorkflowList } from '../../features/workflow_list/ui';
 const workflowTemplateYaml = `name: New workflow
 enabled: false
 triggers:
-  - type: triggers.elastic.manual
+  - type: manual
 steps:
   - name: first-step
     type: console
diff --git a/src/platform/plugins/shared/workflows_management/public/shared/lib/graph_utils.ts b/src/platform/plugins/shared/workflows_management/public/shared/lib/graph_utils.ts
@@ -19,3 +19,16 @@ export function getAllPredecessors(graph: graphlib.Graph, nodeId: string): strin
     ...getAllPredecessors(graph, predecessor),
   ]);
 }
+
+export function getTriggerLabel(triggerType: string) {
+  switch (triggerType) {
+    case 'manual':
+      return 'Manual';
+    case 'alert':
+      return 'Alert';
+    case 'scheduled':
+      return 'Scheduled';
+    default:
+      return triggerType;
+  }
+}
diff --git a/src/platform/plugins/shared/workflows_management/server/examples/scheduled_workflow_example.ts b/src/platform/plugins/shared/workflows_management/server/examples/scheduled_workflow_example.ts
@@ -60,7 +60,7 @@ workflow:
   description: 'A workflow that processes data every 5 minutes'
   enabled: true
   triggers:
-    - type: 'triggers.elastic.scheduled'
+    - type: 'scheduled'
       with:
         every: '5'
         unit: 'minute'
@@ -117,7 +117,7 @@ workflow:
   description: 'A workflow that generates daily reports at 9 AM'
   enabled: true
   triggers:
-    - type: 'triggers.elastic.scheduled'
+    - type: 'scheduled'
       with:
         cron: '0 9 * * *'
   steps:
diff --git a/src/platform/plugins/shared/workflows_management/server/lib/schedule_utils.ts b/src/platform/plugins/shared/workflows_management/server/lib/schedule_utils.ts
@@ -9,7 +9,7 @@
 
 // Define the trigger type based on the schema
 export interface WorkflowTrigger {
-  type: 'triggers.elastic.detectionRule' | 'triggers.elastic.scheduled' | 'triggers.elastic.manual';
+  type: 'alert' | 'scheduled' | 'manual';
   with?: Record<string, any>;
   enabled?: boolean;
 }
@@ -18,8 +18,8 @@ export interface WorkflowTrigger {
  * Converts a workflow scheduled trigger to a task manager schedule format
  */
 export function convertWorkflowScheduleToTaskSchedule(trigger: WorkflowTrigger) {
-  if (trigger.type !== 'triggers.elastic.scheduled') {
-    throw new Error(`Expected trigger type 'triggers.elastic.scheduled', got '${trigger.type}'`);
+  if (trigger.type !== 'scheduled') {
+    throw new Error(`Expected trigger type 'scheduled', got '${trigger.type}'`);
   }
 
   const config = trigger.with || {};
@@ -78,16 +78,12 @@ export function convertWorkflowScheduleToTaskSchedule(trigger: WorkflowTrigger)
  * Checks if a workflow has any scheduled triggers
  */
 export function hasScheduledTriggers(triggers: WorkflowTrigger[]): boolean {
-  return triggers.some(
-    (trigger) => trigger.type === 'triggers.elastic.scheduled' && trigger.enabled
-  );
+  return triggers.some((trigger) => trigger.type === 'scheduled' && trigger.enabled);
 }
 
 /**
  * Gets all scheduled triggers from a workflow
  */
 export function getScheduledTriggers(triggers: WorkflowTrigger[]): WorkflowTrigger[] {
-  return triggers.filter(
-    (trigger) => trigger.type === 'triggers.elastic.scheduled' && trigger.enabled
-  );
+  return triggers.filter((trigger) => trigger.type === 'scheduled' && trigger.enabled);
 }
diff --git a/src/platform/plugins/shared/workflows_management/server/tasks/workflow_task_scheduler.ts b/src/platform/plugins/shared/workflows_management/server/tasks/workflow_task_scheduler.ts
@@ -94,7 +94,7 @@ export class WorkflowTaskScheduler {
           bool: {
             must: [
               { term: { 'task.taskType': 'workflow:scheduled' } },
-              { term: { _id: `task:workflow:${workflowId}:triggers.elastic.scheduled` } },
+              { term: { _id: `task:workflow:${workflowId}:scheduled` } },
             ],
           },
         },
diff --git a/src/platform/plugins/shared/workflows_management/server/workflows_management/workflows_management_service.ts b/src/platform/plugins/shared/workflows_management/server/workflows_management/workflows_management_service.ts
@@ -249,7 +249,7 @@ export class WorkflowsService {
     // Schedule the workflow if it has triggers
     if (this.taskScheduler && workflowToCreate.definition.triggers) {
       for (const trigger of workflowToCreate.definition.triggers) {
-        if (trigger.type === 'triggers.elastic.scheduled' && trigger.enabled) {
+        if (trigger.type === 'scheduled' && trigger.enabled) {
           await this.taskScheduler.scheduleWorkflowTask(response.id, 'default', trigger);
         }
       }
@@ -302,7 +302,7 @@ export class WorkflowsService {
 
         // Add new scheduled tasks
         for (const trigger of updatedWorkflow.definition.workflow.triggers) {
-          if (trigger.type === 'triggers.elastic.scheduled') {
+          if (trigger.type === 'scheduled') {
             await this.taskScheduler.scheduleWorkflowTask(id, 'default', trigger);
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ describe('getContextSchemaForPath', () => {`
`21`	`21`	`enabled: true,`
`22`	`22`	`triggers: [`
`23`	`23`	`{`
`24`		`- type: 'triggers.elastic.manual' as const,`
	`24`	`+ type: 'manual' as const,`
`25`	`25`	`enabled: true,`
`26`	`26`	`},`
`27`	`27`	`],`