[ResponseOps][Alerting] Rule run history displays success with a message when the rule status is warning

x-pack/plugins/actions/server/lib/action_executor.test.ts

@@ -159,6 +159,9 @@ test('successfully executes', async () => {
                 },
               },
             },
+            "alerting": Object {
+              "outcome": "success",
+            },
             "saved_objects": Array [
               Object {
                 "id": "1",
@@ -648,6 +651,9 @@ test('writes to event log for execute and execute start', async () => {
           },
         },
       },
+      alerting: {
+        outcome: 'success',
+      },
       saved_objects: [
         {
           rel: 'primary',
@@ -731,6 +737,9 @@ test('writes to event log for execute and execute start when consumer and relate
           rule_type_id: '.rule-type',
         },
       },
+      alerting: {
+        outcome: 'success',
+      },
       saved_objects: [
         {
           rel: 'primary',

x-pack/plugins/actions/server/lib/action_executor.ts

@@ -253,14 +253,18 @@ export class ActionExecutor {
         };
 
         event.event = event.event || {};
+        event.kibana = event.kibana || {};
+        event.kibana.alerting = event.kibana.alerting || {};
 
         if (result.status === 'ok') {
           span?.setOutcome('success');
           event.event.outcome = 'success';
+          event.kibana.alerting.outcome = 'success';
           event.message = `action executed: ${actionLabel}`;
         } else if (result.status === 'error') {
           span?.setOutcome('failure');
           event.event.outcome = 'failure';
+          event.kibana.alerting.outcome = 'failure';
           event.message = `action execution failure: ${actionLabel}`;
           event.error = event.error || {};
           event.error.message = actionErrorToMessage(result);
@@ -274,6 +278,7 @@ export class ActionExecutor {
         } else {
           span?.setOutcome('failure');
           event.event.outcome = 'failure';
+          event.kibana.alerting.outcome = 'failure';
           event.message = `action execution returned unexpected result: ${actionLabel}: "${result.status}"`;
           event.error = event.error || {};
           event.error.message = 'action execution returned unexpected result';

x-pack/plugins/alerting/common/execution_log_types.ts

@@ -30,6 +30,7 @@ export const EMPTY_EXECUTION_KPI_RESULT = {
   success: 0,
   unknown: 0,
   failure: 0,
+  warning: 0,
   activeAlerts: 0,
   newAlerts: 0,
   recoveredAlerts: 0,

x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.test.ts

@@ -223,6 +223,12 @@ describe('AlertingEventLogger', () => {
           ...event.rule,
           name: 'my-super-cool-rule',
         },
+        kibana: {
+          ...event.kibana,
+          alerting: {
+            outcome: 'success',
+          },
+        },
         message: 'success!',
       });
     });
@@ -260,6 +266,12 @@ describe('AlertingEventLogger', () => {
         error: {
           message: 'something went wrong!',
         },
+        kibana: {
+          ...event.kibana,
+          alerting: {
+            outcome: 'failure',
+          },
+        },
         message: 'rule failed!',
       });
     });
@@ -446,6 +458,7 @@ describe('AlertingEventLogger', () => {
           ...event?.kibana,
           alerting: {
             status: 'error',
+            outcome: 'failure',
           },
         },
         message: 'test:123: execution failed',
@@ -484,6 +497,7 @@ describe('AlertingEventLogger', () => {
           ...event?.kibana,
           alerting: {
             status: 'error',
+            outcome: 'failure',
           },
         },
         message: 'test:123: execution failed',
@@ -526,6 +540,7 @@ describe('AlertingEventLogger', () => {
           ...event?.kibana,
           alerting: {
             status: 'error',
+            outcome: 'failure',
           },
         },
         message: 'i am an existing error message',
@@ -560,6 +575,7 @@ describe('AlertingEventLogger', () => {
           ...event?.kibana,
           alerting: {
             status: 'warning',
+            outcome: 'warning',
           },
         },
         message: 'something funky happened',
@@ -594,6 +610,7 @@ describe('AlertingEventLogger', () => {
           ...event?.kibana,
           alerting: {
             status: 'warning',
+            outcome: 'warning',
           },
         },
         message: 'something funky happened',
@@ -630,6 +647,7 @@ describe('AlertingEventLogger', () => {
           ...event?.kibana,
           alerting: {
             status: 'warning',
+            outcome: 'success',
           },
         },
         message: 'success!',

x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.ts

@@ -127,15 +127,20 @@ export class AlertingEventLogger {
       throw new Error('AlertingEventLogger not initialized');
     }
 
-    updateEvent(this.event, { message, outcome: 'success' });
+    updateEvent(this.event, { message, outcome: 'success', alertingOutcome: 'success' });
   }
 
   public setExecutionFailed(message: string, errorMessage: string) {
     if (!this.isInitialized || !this.event) {
       throw new Error('AlertingEventLogger not initialized');
     }
 
-    updateEvent(this.event, { message, outcome: 'failure', error: errorMessage });
+    updateEvent(this.event, {
+      message,
+      outcome: 'failure',
+      alertingOutcome: 'failure',
+      error: errorMessage,
+    });
   }
 
   public logTimeout() {
@@ -175,6 +180,7 @@ export class AlertingEventLogger {
       if (status.error) {
         updateEvent(this.event, {
           outcome: 'failure',
+          alertingOutcome: 'failure',
           reason: status.error?.reason || 'unknown',
           error: this.event?.error?.message || status.error.message,
           ...(this.event.message
@@ -186,6 +192,7 @@ export class AlertingEventLogger {
       } else {
         if (status.warning) {
           updateEvent(this.event, {
+            alertingOutcome: 'warning',
             reason: status.warning?.reason || 'unknown',
             message: status.warning?.message || this.event?.message,
           });
@@ -325,15 +332,18 @@ export function initializeExecuteRecord(context: RuleContext) {
 interface UpdateEventOpts {
   message?: string;
   outcome?: string;
+  alertingOutcome?: string;
   error?: string;
   ruleName?: string;
   status?: string;
   reason?: string;
   metrics?: RuleRunMetrics;
   timings?: TaskRunnerTimings;
 }
+
 export function updateEvent(event: IEvent, opts: UpdateEventOpts) {
-  const { message, outcome, error, ruleName, status, reason, metrics, timings } = opts;
+  const { message, outcome, error, ruleName, status, reason, metrics, timings, alertingOutcome } =
+    opts;
   if (!event) {
     throw new Error('Cannot update event because it is not initialized.');
   }
@@ -346,6 +356,12 @@ export function updateEvent(event: IEvent, opts: UpdateEventOpts) {
     event.event.outcome = outcome;
   }
 
+  if (alertingOutcome) {
+    event.kibana = event.kibana || {};
+    event.kibana.alerting = event.kibana.alerting || {};
+    event.kibana.alerting.outcome = alertingOutcome;
+  }
+
   if (error) {
     event.error = event.error || {};
     event.error.message = error;