[RAM] Allow users to see event logs from all spaces they have access to

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

@@ -61,6 +61,7 @@ export interface IExecutionLog {
   schedule_delay_ms: number;
   timed_out: boolean;
   rule_id: string;
+  space_ids: string[];
   rule_name: string;
 }
 

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

@@ -280,6 +280,7 @@ describe('getExecutionLogAggregation', () => {
                           'error.message',
                           'kibana.version',
                           'rule.id',
+                          'kibana.space_ids',
                           'rule.name',
                           'kibana.alerting.outcome',
                         ],
@@ -486,6 +487,7 @@ describe('getExecutionLogAggregation', () => {
                           'error.message',
                           'kibana.version',
                           'rule.id',
+                          'kibana.space_ids',
                           'rule.name',
                           'kibana.alerting.outcome',
                         ],
@@ -692,6 +694,7 @@ describe('getExecutionLogAggregation', () => {
                           'error.message',
                           'kibana.version',
                           'rule.id',
+                          'kibana.space_ids',
                           'rule.name',
                           'kibana.alerting.outcome',
                         ],
@@ -954,6 +957,7 @@ describe('formatExecutionLogResult', () => {
           schedule_delay_ms: 3074,
           rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
           rule_name: 'rule_name',
+          space_ids: [],
         },
         {
           id: '41b2755e-765a-4044-9745-b03875d5e79a',
@@ -976,6 +980,7 @@ describe('formatExecutionLogResult', () => {
           schedule_delay_ms: 3126,
           rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
           rule_name: 'rule_name',
+          space_ids: [],
         },
       ],
     });
@@ -1203,6 +1208,7 @@ describe('formatExecutionLogResult', () => {
           schedule_delay_ms: 3074,
           rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
           rule_name: 'rule_name',
+          space_ids: [],
         },
         {
           id: '41b2755e-765a-4044-9745-b03875d5e79a',
@@ -1225,6 +1231,7 @@ describe('formatExecutionLogResult', () => {
           schedule_delay_ms: 3126,
           rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
           rule_name: 'rule_name',
+          space_ids: [],
         },
       ],
     });
@@ -1444,6 +1451,7 @@ describe('formatExecutionLogResult', () => {
           schedule_delay_ms: 3074,
           rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
           rule_name: 'rule_name',
+          space_ids: [],
         },
         {
           id: '41b2755e-765a-4044-9745-b03875d5e79a',
@@ -1466,6 +1474,7 @@ describe('formatExecutionLogResult', () => {
           schedule_delay_ms: 3126,
           rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
           rule_name: 'rule_name',
+          space_ids: [],
         },
       ],
     });
@@ -1690,6 +1699,7 @@ describe('formatExecutionLogResult', () => {
           schedule_delay_ms: 3126,
           rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
           rule_name: 'rule_name',
+          space_ids: [],
         },
         {
           id: '61bb867b-661a-471f-bf92-23471afa10b3',
@@ -1712,6 +1722,7 @@ describe('formatExecutionLogResult', () => {
           schedule_delay_ms: 3133,
           rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
           rule_name: 'rule_name',
+          space_ids: [],
         },
       ],
     });

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

@@ -18,6 +18,7 @@ const DEFAULT_MAX_BUCKETS_LIMIT = 1000; // do not retrieve more than this number
 const DEFAULT_MAX_KPI_BUCKETS_LIMIT = 10000;
 
 const RULE_ID_FIELD = 'rule.id';
+const SPACE_ID_FIELD = 'kibana.space_ids';
 const RULE_NAME_FIELD = 'rule.name';
 const PROVIDER_FIELD = 'event.provider';
 const START_FIELD = 'event.start';
@@ -410,6 +411,7 @@ export function getExecutionLogAggregation({
                         ERROR_MESSAGE_FIELD,
                         VERSION_FIELD,
                         RULE_ID_FIELD,
+                        SPACE_ID_FIELD,
                         RULE_NAME_FIELD,
                         ALERTING_OUTCOME_FIELD,
                       ],
@@ -494,8 +496,9 @@ function formatExecutionLogAggBucket(bucket: IExecutionUuidAggBucket): IExecutio
     status === 'failure' ? `${outcomeMessage} - ${outcomeErrorMessage}` : outcomeMessage;
   const version = outcomeAndMessage.kibana?.version ?? '';
 
-  const ruleId = outcomeAndMessage.rule?.id ?? '';
-  const ruleName = outcomeAndMessage.rule?.name ?? '';
+  const ruleId = outcomeAndMessage ? outcomeAndMessage?.rule?.id ?? '' : '';
+  const spaceIds = outcomeAndMessage ? outcomeAndMessage?.kibana?.space_ids ?? [] : [];
+  const ruleName = outcomeAndMessage ? outcomeAndMessage.rule?.name ?? '' : '';
   return {
     id: bucket?.key ?? '',
     timestamp: bucket?.ruleExecution?.executeStartTime.value_as_string ?? '',
@@ -515,6 +518,7 @@ function formatExecutionLogAggBucket(bucket: IExecutionUuidAggBucket): IExecutio
     schedule_delay_ms: scheduleDelayUs / Millis2Nanos,
     timed_out: timedOut,
     rule_id: ruleId,
+    space_ids: spaceIds,
     rule_name: ruleName,
   };
 }

x-pack/plugins/alerting/server/routes/get_global_execution_kpi.ts

@@ -7,22 +7,25 @@
 import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { AlertingRequestHandlerContext, INTERNAL_BASE_ALERTING_API_PATH } from '../types';
-import { RewriteRequestCase, verifyAccessAndContext } from './lib';
+import { RewriteRequestCase, verifyAccessAndContext, rewriteNamespaces } from './lib';
 import { GetGlobalExecutionKPIParams } from '../rules_client';
 import { ILicenseState } from '../lib';
 
 const querySchema = schema.object({
   date_start: schema.string(),
   date_end: schema.maybe(schema.string()),
   filter: schema.maybe(schema.string()),
+  namespaces: schema.maybe(schema.arrayOf(schema.string())),
 });
 
 const rewriteReq: RewriteRequestCase<GetGlobalExecutionKPIParams> = ({
   date_start: dateStart,
   date_end: dateEnd,
+  namespaces,
   ...rest
 }) => ({
   ...rest,
+  namespaces: rewriteNamespaces(namespaces),
   dateStart,
   dateEnd,
 });

x-pack/plugins/alerting/server/routes/get_global_execution_logs.test.ts

@@ -47,6 +47,7 @@ describe('getRuleExecutionLogRoute', () => {
         schedule_delay_ms: 3126,
         rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
         rule_name: 'rule-name',
+        space_ids: ['namespace'],
       },
       {
         id: '41b2755e-765a-4044-9745-b03875d5e79a',
@@ -69,6 +70,7 @@ describe('getRuleExecutionLogRoute', () => {
         schedule_delay_ms: 3008,
         rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
         rule_name: 'rule-name',
+        space_ids: ['namespace'],
       },
     ],
   };

x-pack/plugins/alerting/server/routes/get_global_execution_logs.ts

@@ -9,7 +9,7 @@ import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState } from '../lib';
 import { GetGlobalExecutionLogParams } from '../rules_client';
-import { RewriteRequestCase, verifyAccessAndContext } from './lib';
+import { RewriteRequestCase, verifyAccessAndContext, rewriteNamespaces } from './lib';
 import { AlertingRequestHandlerContext, INTERNAL_BASE_ALERTING_API_PATH } from '../types';
 
 const sortOrderSchema = schema.oneOf([schema.literal('asc'), schema.literal('desc')]);
@@ -38,15 +38,18 @@ const querySchema = schema.object({
   per_page: schema.number({ defaultValue: 10, min: 1 }),
   page: schema.number({ defaultValue: 1, min: 1 }),
   sort: sortFieldsSchema,
+  namespaces: schema.maybe(schema.arrayOf(schema.string())),
 });
 
 const rewriteReq: RewriteRequestCase<GetGlobalExecutionLogParams> = ({
   date_start: dateStart,
   date_end: dateEnd,
   per_page: perPage,
+  namespaces,
   ...rest
 }) => ({
   ...rest,
+  namespaces: rewriteNamespaces(namespaces),
   dateStart,
   dateEnd,
   perPage,

x-pack/plugins/alerting/server/routes/get_rule_execution_log.test.ts

@@ -48,6 +48,7 @@ describe('getRuleExecutionLogRoute', () => {
         schedule_delay_ms: 3126,
         rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
         rule_name: 'rule_name',
+        space_ids: ['namespace'],
       },
       {
         id: '41b2755e-765a-4044-9745-b03875d5e79a',
@@ -70,6 +71,7 @@ describe('getRuleExecutionLogRoute', () => {
         schedule_delay_ms: 3008,
         rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
         rule_name: 'rule_name',
+        space_ids: ['namespace'],
       },
     ],
   };

x-pack/plugins/alerting/server/routes/lib/index.ts

@@ -19,3 +19,4 @@ export type {
 export { verifyAccessAndContext } from './verify_access_and_context';
 export { countUsageOfPredefinedIds } from './count_usage_of_predefined_ids';
 export { rewriteRule } from './rewrite_rule';
+export { rewriteNamespaces } from './rewrite_namespaces';

x-pack/plugins/alerting/server/routes/lib/rewrite_namespaces.ts

@@ -0,0 +1,11 @@
+/*
+ * 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.
+ */
+
+export const rewriteNamespaces = (namespaces?: Array<string | undefined>) =>
+  namespaces
+    ? namespaces.map((id: string | undefined) => (id === 'default' ? undefined : id))
+    : undefined;

x-pack/plugins/alerting/server/rules_client/rules_client.ts

@@ -398,6 +398,7 @@ export interface GetGlobalExecutionKPIParams {
   dateStart: string;
   dateEnd?: string;
   filter?: string;
+  namespaces?: Array<string | undefined>;
 }
 
 export interface GetGlobalExecutionLogParams {
@@ -407,6 +408,7 @@ export interface GetGlobalExecutionLogParams {
   page: number;
   perPage: number;
   sort: estypes.Sort;
+  namespaces?: Array<string | undefined>;
 }
 
 export interface GetActionErrorLogByIdParams {
@@ -930,6 +932,7 @@ export class RulesClient {
     page,
     perPage,
     sort,
+    namespaces,
   }: GetGlobalExecutionLogParams): Promise<IExecutionLogResult> {
     this.logger.debug(`getGlobalExecutionLogWithAuth(): getting global execution log`);
 
@@ -980,7 +983,8 @@ export class RulesClient {
             perPage,
             sort,
           }),
-        }
+        },
+        namespaces
       );
 
       return formatExecutionLogResult(aggResult);
@@ -1066,6 +1070,7 @@ export class RulesClient {
     dateStart,
     dateEnd,
     filter,
+    namespaces,
   }: GetGlobalExecutionKPIParams) {
     this.logger.debug(`getGlobalExecutionLogWithAuth(): getting global execution log`);
 
@@ -1111,7 +1116,8 @@ export class RulesClient {
           start: parsedDateStart.toISOString(),
           end: parsedDateEnd.toISOString(),
           aggs: getExecutionKPIAggregation(filter),
-        }
+        },
+        namespaces
       );
 
       return formatExecutionKPIResult(aggResult);

x-pack/plugins/alerting/server/rules_client/tests/get_execution_log.test.ts

@@ -385,6 +385,7 @@ describe('getExecutionLogForRule()', () => {
           schedule_delay_ms: 3126,
           rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
           rule_name: 'rule-name',
+          space_ids: [],
         },
         {
           id: '41b2755e-765a-4044-9745-b03875d5e79a',
@@ -407,6 +408,7 @@ describe('getExecutionLogForRule()', () => {
           schedule_delay_ms: 3345,
           rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
           rule_name: 'rule-name',
+          space_ids: [],
         },
       ],
     });
@@ -719,6 +721,7 @@ describe('getGlobalExecutionLogWithAuth()', () => {
           schedule_delay_ms: 3126,
           rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
           rule_name: 'rule-name',
+          space_ids: [],
         },
         {
           id: '41b2755e-765a-4044-9745-b03875d5e79a',
@@ -741,6 +744,7 @@ describe('getGlobalExecutionLogWithAuth()', () => {
           schedule_delay_ms: 3345,
           rule_id: 'a348a740-9e2c-11ec-bd64-774ed95c43ef',
           rule_name: 'rule-name',
+          space_ids: [],
         },
       ],
     });