[Search] Search Sessions Monitoring Task

x-pack/plugins/alerts/server/alerts_client/alerts_client.ts

@@ -43,7 +43,6 @@ import {
 import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';
 import { TaskManagerStartContract } from '../../../task_manager/server';
 import { taskInstanceToAlertTaskInstance } from '../task_runner/alert_task_instance';
-import { deleteTaskIfItExists } from '../lib/delete_task_if_it_exists';
 import { RegistryAlertType, UntypedNormalizedAlertType } from '../alert_type_registry';
 import { AlertsAuthorization, WriteOperations, ReadOperations } from '../authorization';
 import { IEventLogClient } from '../../../../plugins/event_log/server';
@@ -602,7 +601,7 @@ export class AlertsClient {
  const removeResult = await this.unsecuredSavedObjectsClient.delete('alert', id);
 
  await Promise.all([
- taskIdToRemove ? deleteTaskIfItExists(this.taskManager, taskIdToRemove) : null,
+ taskIdToRemove ? this.taskManager.removeIfExists(taskIdToRemove) : null,
  apiKeyToInvalidate
  ? markApiKeyForInvalidation(
  { apiKey: apiKeyToInvalidate },
@@ -1060,7 +1059,7 @@ export class AlertsClient {
 
  await Promise.all([
  attributes.scheduledTaskId
- ? deleteTaskIfItExists(this.taskManager, attributes.scheduledTaskId)
+ ? this.taskManager.removeIfExists(attributes.scheduledTaskId)
  : null,
  apiKeyToInvalidate
  ? await markApiKeyForInvalidation(

x-pack/plugins/alerts/server/alerts_client/tests/delete.test.ts

@@ -110,7 +110,7 @@ describe('delete()', () => {
  const result = await alertsClient.delete({ id: '1' });
  expect(result).toEqual({ success: true });
  expect(unsecuredSavedObjectsClient.delete).toHaveBeenCalledWith('alert', '1');
- expect(taskManager.remove).toHaveBeenCalledWith('task-123');
+ expect(taskManager.removeIfExists).toHaveBeenCalledWith('task-123');
  expect(unsecuredSavedObjectsClient.create.mock.calls[0][0]).toBe(
  'api_key_pending_invalidation'
  );
@@ -135,7 +135,7 @@ describe('delete()', () => {
  const result = await alertsClient.delete({ id: '1' });
  expect(result).toEqual({ success: true });
  expect(unsecuredSavedObjectsClient.delete).toHaveBeenCalledWith('alert', '1');
- expect(taskManager.remove).toHaveBeenCalledWith('task-123');
+ expect(taskManager.removeIfExists).toHaveBeenCalledWith('task-123');
  expect(unsecuredSavedObjectsClient.create).not.toHaveBeenCalled();
  expect(unsecuredSavedObjectsClient.get).toHaveBeenCalledWith('alert', '1');
  expect(alertsClientParams.logger.error).toHaveBeenCalledWith(
@@ -153,7 +153,7 @@ describe('delete()', () => {
  });
 
  await alertsClient.delete({ id: '1' });
- expect(taskManager.remove).not.toHaveBeenCalled();
+ expect(taskManager.removeIfExists).not.toHaveBeenCalled();
  });
 
  test(`doesn't invalidate API key when apiKey is null`, async () => {
@@ -217,8 +217,8 @@ describe('delete()', () => {
  );
  });
 
- test('throws error when taskManager.remove throws an error', async () => {
- taskManager.remove.mockRejectedValue(new Error('TM Fail'));
+ test('throws error when taskManager.removeIfExists throws an error', async () => {
+ taskManager.removeIfExists.mockRejectedValue(new Error('TM Fail'));
 
  await expect(alertsClient.delete({ id: '1' })).rejects.toThrowErrorMatchingInlineSnapshot(
  `"TM Fail"`

x-pack/plugins/alerts/server/alerts_client/tests/disable.test.ts

@@ -199,7 +199,7 @@ describe('disable()', () => {
  version: '123',
  }
  );
- expect(taskManager.remove).toHaveBeenCalledWith('task-123');
+ expect(taskManager.removeIfExists).toHaveBeenCalledWith('task-123');
  expect(
  (unsecuredSavedObjectsClient.create.mock.calls[0][1] as InvalidatePendingApiKey).apiKeyId
  ).toBe('123');
@@ -254,7 +254,7 @@ describe('disable()', () => {
  version: '123',
  }
  );
- expect(taskManager.remove).toHaveBeenCalledWith('task-123');
+ expect(taskManager.removeIfExists).toHaveBeenCalledWith('task-123');
  expect(unsecuredSavedObjectsClient.create).not.toHaveBeenCalled();
  });
 
@@ -280,7 +280,7 @@ describe('disable()', () => {
 
  await alertsClient.disable({ id: '1' });
  expect(unsecuredSavedObjectsClient.update).not.toHaveBeenCalled();
- expect(taskManager.remove).not.toHaveBeenCalled();
+ expect(taskManager.removeIfExists).not.toHaveBeenCalled();
  expect(unsecuredSavedObjectsClient.create).not.toHaveBeenCalled();
  });
 
@@ -314,7 +314,7 @@ describe('disable()', () => {
 
  await alertsClient.disable({ id: '1' });
  expect(unsecuredSavedObjectsClient.update).toHaveBeenCalled();
- expect(taskManager.remove).toHaveBeenCalled();
+ expect(taskManager.removeIfExists).toHaveBeenCalled();
  expect(unsecuredSavedObjectsClient.create).not.toHaveBeenCalled();
  expect(alertsClientParams.logger.error).toHaveBeenCalledWith(
  'disable(): Failed to load API key to invalidate on alert 1: Fail'
@@ -338,7 +338,7 @@ describe('disable()', () => {
  });
 
  test('throws when failing to remove task from task manager', async () => {
- taskManager.remove.mockRejectedValueOnce(new Error('Failed to remove task'));
+ taskManager.removeIfExists.mockRejectedValueOnce(new Error('Failed to remove task'));
 
  await expect(alertsClient.disable({ id: '1' })).rejects.toThrowErrorMatchingInlineSnapshot(
  `"Failed to remove task"`

x-pack/plugins/data_enhanced/common/index.ts

@@ -13,7 +13,6 @@ export {
  IAsyncSearchOptions,
  pollSearch,
  SearchSessionSavedObjectAttributes,
- SearchSessionFindOptions,
  SearchSessionStatus,
  SearchSessionRequestInfo,
 } from './search';

x-pack/plugins/data_enhanced/common/search/session/types.ts

@@ -13,18 +13,55 @@ export interface SearchSessionSavedObjectAttributes {
  * App that created the session. e.g 'discover'
  */
  appId: string;
+ /**
+ * Creation time of the session
+ */
  created: string;
+ /**
+ * Expiration time of the session. Expiration itself is managed by Elasticsearch.
+ */
  expires: string;
+ /**
+ * status
+ */
  status: string;
+ /**
+ * urlGeneratorId
+ */
  urlGeneratorId: string;
+ /**
+ * The application state that was used to create the session.
+ * Should be used, for example, to re-load an expired search session.
+ */
  initialState: Record<string, unknown>;
+ /**
+ * Application state that should be used to restore the session.
+ * For example, relative dates are conveted to absolute ones.
+ */
  restoreState: Record<string, unknown>;
+ /**
+ * Mapping of search request hashes to their corresponsing info (async search id, etc.)
+ */
  idMapping: Record<string, SearchSessionRequestInfo>;
 }
 
 export interface SearchSessionRequestInfo {
- id: string; // ID of the async search request
- strategy: string; // Search strategy used to submit the search request
+ /**
+ * ID of the async search request
+ */
+ id: string;
+ /**
+ * Search strategy used to submit the search request
+ */
+ strategy: string;
+ /**
+ * status
+ */
+ status: string;
+ /**
+ * An optional error. Set if status is set to error.
+ */
+ error?: string;
 }
 
 export interface SearchSessionFindOptions {

x-pack/plugins/data_enhanced/kibana.json

@@ -8,7 +8,8 @@
  "requiredPlugins": [
  "bfetch",
  "data",
- "features"
+ "features",
+ "taskManager"
  ],
  "optionalPlugins": ["kibanaUtils", "usageCollection"],
  "server": true,

x-pack/plugins/data_enhanced/server/plugin.ts

@@ -5,6 +5,7 @@
  */
 
 import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
 import {
  PluginSetup as DataPluginSetup,
  PluginStart as DataPluginStart,
@@ -24,9 +25,15 @@ import { getUiSettings } from './ui_settings';
 interface SetupDependencies {
  data: DataPluginSetup;
  usageCollection?: UsageCollectionSetup;
+ taskManager: TaskManagerSetupContract;
+}
+export interface StartDependencies {
+ data: DataPluginStart;
+ taskManager: TaskManagerStartContract;
 }
 
-export class EnhancedDataServerPlugin implements Plugin<void, void, SetupDependencies> {
+export class EnhancedDataServerPlugin
+ implements Plugin<void, void, SetupDependencies, StartDependencies> {
  private readonly logger: Logger;
  private sessionService!: SearchSessionService;
 
@@ -65,10 +72,17 @@ export class EnhancedDataServerPlugin implements Plugin<void, void, SetupDepende
 
  const router = core.http.createRouter();
  registerSessionRoutes(router);
+
+ this.sessionService.setup(core, {
+ taskManager: deps.taskManager,
+ });
  }
 
- public start(core: CoreStart) {
- this.sessionService.start(core, this.initializerContext.config.create());
+ public start(core: CoreStart, { taskManager }: StartDependencies) {
+ this.sessionService.start(core, {
+ taskManager,
+ config$: this.initializerContext.config.create(),
+ });
  }
 
  public stop() {