[RAM] Add error logs in rule details page

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

@@ -36,7 +36,16 @@ export interface IExecutionLog {
   timed_out: boolean;
 }
 
+export interface IErrorLog {
+  id: string;
+  timestamp: string;
+  type: string;
+  message: string;
+}
+
 export interface IExecutionLogResult {
   total: number;
+  totalErrors: number;
   data: IExecutionLog[];
+  errors: IErrorLog[];
 }

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

@@ -228,6 +228,8 @@ describe('formatExecutionLogResult', () => {
     expect(formatExecutionLogResult({ aggregations: undefined })).toEqual({
       total: 0,
       data: [],
+      errors: [],
+      totalErrors: 0,
     });
   });
   test('should format results correctly', () => {

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

@@ -34,7 +34,9 @@ const Millis2Nanos = 1000 * 1000;
 
 export const EMPTY_EXECUTION_LOG_RESULT = {
   total: 0,
+  totalErrors: 0,
   data: [],
+  errors: [],
 };
 
 interface IAlertCounts extends estypes.AggregationsMultiBucketAggregateBase {
@@ -277,7 +279,7 @@ function formatExecutionLogAggBucket(bucket: IExecutionUuidAggBucket): IExecutio
 
 export function formatExecutionLogResult(
   results: AggregateEventsBySavedObjectResult
-): IExecutionLogResult {
+): Pick<IExecutionLogResult, 'total' | 'data'> {
   const { aggregations } = results;
 
   if (!aggregations) {

x-pack/plugins/translations/translations/ja-JP.json

@@ -27781,11 +27781,6 @@
     "xpack.triggersActionsUI.sections.ruleDetails.ruleDetailsTitle": "{ruleName}",
     "xpack.triggersActionsUI.sections.ruleDetails.alertInstances.disabledRule": "このルールは無効になっていて再表示できません。",
     "xpack.triggersActionsUI.sections.ruleDetails.alertInstances.disabledRuleTitle": "無効なルール",
-    "xpack.triggersActionsUI.sections.ruleDetails.collapsedItemActons.enableLoadingTitle": "有効にする",
-    "xpack.triggersActionsUI.sections.ruleDetails.collapsedItemActons.enableTitle": "有効にする",
-    "xpack.triggersActionsUI.sections.ruleDetails.collapsedItemActons.muteLoadingTitle": "ミュート",
-    "xpack.triggersActionsUI.sections.ruleDetails.collapsedItemActons.muteTitle": "ミュート",
-    "xpack.triggersActionsUI.sections.ruleDetails.dismissButtonTitle": "閉じる",
     "xpack.triggersActionsUI.sections.ruleDetails.editRuleButtonLabel": "編集",
     "xpack.triggersActionsUI.sections.ruleDetails.manageLicensePlanBannerLinkTitle": "ライセンスの管理",
     "xpack.triggersActionsUI.sections.ruleDetails.redirectObjectNoun": "ルール",

x-pack/plugins/translations/translations/zh-CN.json

@@ -27810,11 +27810,6 @@
     "xpack.triggersActionsUI.sections.ruleDetails.ruleDetailsTitle": "{ruleName}",
     "xpack.triggersActionsUI.sections.ruleDetails.alertInstances.disabledRule": "此规则已禁用，无法显示。",
     "xpack.triggersActionsUI.sections.ruleDetails.alertInstances.disabledRuleTitle": "已禁用规则",
-    "xpack.triggersActionsUI.sections.ruleDetails.collapsedItemActons.enableLoadingTitle": "启用",
-    "xpack.triggersActionsUI.sections.ruleDetails.collapsedItemActons.enableTitle": "启用",
-    "xpack.triggersActionsUI.sections.ruleDetails.collapsedItemActons.muteLoadingTitle": "静音",
-    "xpack.triggersActionsUI.sections.ruleDetails.collapsedItemActons.muteTitle": "静音",
-    "xpack.triggersActionsUI.sections.ruleDetails.dismissButtonTitle": "关闭",
     "xpack.triggersActionsUI.sections.ruleDetails.editRuleButtonLabel": "编辑",
     "xpack.triggersActionsUI.sections.ruleDetails.manageLicensePlanBannerLinkTitle": "管理许可证",
     "xpack.triggersActionsUI.sections.ruleDetails.redirectObjectNoun": "规则",

x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts

@@ -36,9 +36,16 @@ const getRenamedLog = (data: IExecutionLog) => {
   };
 };
 
-const rewriteBodyRes: RewriteRequestCase<IExecutionLogResult> = ({ data, total }: any) => ({
+const rewriteBodyRes: RewriteRequestCase<IExecutionLogResult> = ({
+  data,
+  errors,
+  total,
+  totalErrors,
+}: any) => ({
   data: data.map((log: IExecutionLog) => getRenamedLog(log)),
+  errors,
   total,
+  totalErrors,
 });
 
 const getFilter = (filter: string[] | undefined) => {

x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx

@@ -35,6 +35,8 @@ import {
   resolveRule,
   loadExecutionLogAggregations,
   LoadExecutionLogAggregationsProps,
+  snoozeRule,
+  unsnoozeRule,
 } from '../../../lib/rule_api';
 import { IExecutionLogResult } from '../../../../../../alerting/common';
 import { useKibana } from '../../../../common/lib/kibana';
@@ -67,6 +69,8 @@ export interface ComponentOpts {
   ) => Promise<IExecutionLogResult>;
   getHealth: () => Promise<AlertingFrameworkHealth>;
   resolveRule: (id: Rule['id']) => Promise<ResolvedRule>;
+  snoozeRule: (rule: Rule, snoozeEndTime: string | -1) => Promise<void>;
+  unsnoozeRule: (rule: Rule) => Promise<void>;
 }
 
 export type PropsWithOptionalApiHandlers<T> = Omit<T, keyof ComponentOpts> & Partial<ComponentOpts>;
@@ -145,6 +149,12 @@ export function withBulkRuleOperations<T>(
         }
         resolveRule={async (ruleId: Rule['id']) => resolveRule({ http, ruleId })}
         getHealth={async () => alertingFrameworkHealth({ http })}
+        snoozeRule={async (rule: Rule, snoozeEndTime: string | -1) => {
+          return await snoozeRule({ http, id: rule.id, snoozeEndTime });
+        }}
+        unsnoozeRule={async (rule: Rule) => {
+          return await unsnoozeRule({ http, id: rule.id });
+        }}
       />
     );
   };

x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx

@@ -47,6 +47,7 @@ import { getIsExperimentalFeatureEnabled } from '../../../../common/get_experime
 import { suspendedComponentWithProps } from '../../../lib/suspended_component_with_props';
 
 const RuleEventLogListWithApi = lazy(() => import('./rule_event_log_list'));
+const RuleErrorLogWithApi = lazy(() => import('./rule_error_log'));
 
 const RuleAlertList = lazy(() => import('./rule_alert_list'));
 
@@ -56,6 +57,7 @@ type RuleProps = {
   readOnly: boolean;
   ruleSummary: RuleSummary;
   requestRefresh: () => Promise<void>;
+  refreshToken?: number;
   numberOfExecutions: number;
   onChangeDuration: (length: number) => void;
   durationEpoch?: number;
@@ -64,6 +66,7 @@ type RuleProps = {
 
 const EVENT_LOG_LIST_TAB = 'rule_event_log_list';
 const ALERT_LIST_TAB = 'rule_alert_list';
+const EVENT_ERROR_LOG_TAB = 'rule_error_log_list';
 
 export function RuleComponent({
   rule,
@@ -73,6 +76,7 @@ export function RuleComponent({
   muteAlertInstance,
   unmuteAlertInstance,
   requestRefresh,
+  refreshToken,
   numberOfExecutions,
   onChangeDuration,
   durationEpoch = Date.now(),
@@ -116,10 +120,13 @@ export function RuleComponent({
     {
       id: EVENT_LOG_LIST_TAB,
       name: i18n.translate('xpack.triggersActionsUI.sections.ruleDetails.rule.eventLogTabText', {
-        defaultMessage: 'Execution History',
+        defaultMessage: 'Execution history',
       }),
       'data-test-subj': 'eventLogListTab',
-      content: suspendedComponentWithProps(RuleEventLogListWithApi, 'xl')({ rule }),
+      content: suspendedComponentWithProps(
+        RuleEventLogListWithApi,
+        'xl'
+      )({ requestRefresh, rule, refreshToken }),
     },
     {
       id: ALERT_LIST_TAB,
@@ -129,6 +136,17 @@ export function RuleComponent({
       'data-test-subj': 'ruleAlertListTab',
       content: renderRuleAlertList(),
     },
+    {
+      id: EVENT_ERROR_LOG_TAB,
+      name: i18n.translate('xpack.triggersActionsUI.sections.ruleDetails.rule.errorLogTabText', {
+        defaultMessage: 'Error log',
+      }),
+      'data-test-subj': 'errorLogTab',
+      content: suspendedComponentWithProps(
+        RuleErrorLogWithApi,
+        'xl'
+      )({ requestRefresh, rule, refreshToken }),
+    },
   ];
 
   const renderTabs = () => {