Skip to content

Commit 6ec6466

Browse files
committed
Merge branch 'task-manager/health' into task-manager/health-with-dynamic-configs
* task-manager/health: (37 commits) updated docs fixed config mocks ensure we dont aggregate workload before tm is readyt make hot stats refresh rate configurable estimate recurring tasks in schedule fixed src import plug health into service status removed unused import Added health status in each section spaces -> tabs updated json in readme added readme change RGY to OK Error and Warn corrected types test status in aceptancve tests added status on health api fixed mock import fixed tests use APM agg types added upper bound to schedule density ...
2 parents 3fa42d8 + 689d014 commit 6ec6466

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3841
-306
lines changed

x-pack/plugins/actions/server/action_type_registry.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
7+
import { taskManagerMock } from '../../task_manager/server/mocks';
88
import { ActionTypeRegistry, ActionTypeRegistryOpts } from './action_type_registry';
99
import { ActionType, ExecutorType } from './types';
1010
import { ActionExecutor, ExecutorError, ILicenseState, TaskRunnerFactory } from './lib';
1111
import { actionsConfigMock } from './actions_config.mock';
1212
import { licenseStateMock } from './lib/license_state.mock';
1313
import { ActionsConfigurationUtilities } from './actions_config';
1414

15-
const mockTaskManager = taskManagerMock.setup();
15+
const mockTaskManager = taskManagerMock.createSetup();
1616
let mockedLicenseState: jest.Mocked<ILicenseState>;
1717
let mockedActionsConfig: jest.Mocked<ActionsConfigurationUtilities>;
1818
let actionTypeRegistryParams: ActionTypeRegistryOpts;

x-pack/plugins/actions/server/actions_client.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { ActionTypeRegistry, ActionTypeRegistryOpts } from './action_type_regist
1010
import { ActionsClient } from './actions_client';
1111
import { ExecutorType } from './types';
1212
import { ActionExecutor, TaskRunnerFactory, ILicenseState } from './lib';
13-
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
13+
import { taskManagerMock } from '../../task_manager/server/mocks';
1414
import { actionsConfigMock } from './actions_config.mock';
1515
import { getActionsConfigurationUtilities } from './actions_config';
1616
import { licenseStateMock } from './lib/license_state.mock';
@@ -33,7 +33,7 @@ const authorization = actionsAuthorizationMock.create();
3333
const executionEnqueuer = jest.fn();
3434
const request = {} as KibanaRequest;
3535

36-
const mockTaskManager = taskManagerMock.setup();
36+
const mockTaskManager = taskManagerMock.createSetup();
3737

3838
let actionsClient: ActionsClient;
3939
let mockedLicenseState: jest.Mocked<ILicenseState>;

x-pack/plugins/actions/server/builtin_action_types/index.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import { ActionExecutor, TaskRunnerFactory } from '../lib';
88
import { ActionTypeRegistry } from '../action_type_registry';
9-
import { taskManagerMock } from '../../../task_manager/server/task_manager.mock';
9+
import { taskManagerMock } from '../../../task_manager/server/mocks';
1010
import { registerBuiltInActionTypes } from './index';
1111
import { Logger } from '../../../../../src/core/server';
1212
import { loggingSystemMock } from '../../../../../src/core/server/mocks';
@@ -21,7 +21,7 @@ export function createActionTypeRegistry(): {
2121
} {
2222
const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
2323
const actionTypeRegistry = new ActionTypeRegistry({
24-
taskManager: taskManagerMock.setup(),
24+
taskManager: taskManagerMock.createSetup(),
2525
taskRunnerFactory: new TaskRunnerFactory(
2626
new ActionExecutor({ isESOUsingEphemeralEncryptionKey: false })
2727
),

x-pack/plugins/actions/server/create_execute_function.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import { KibanaRequest } from 'src/core/server';
88
import uuid from 'uuid';
9-
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
9+
import { taskManagerMock } from '../../task_manager/server/mocks';
1010
import { createExecutionEnqueuerFunction } from './create_execute_function';
1111
import { savedObjectsClientMock } from '../../../../src/core/server/mocks';
1212
import { actionTypeRegistryMock } from './action_type_registry.mock';
@@ -15,7 +15,7 @@ import {
1515
asSavedObjectExecutionSource,
1616
} from './lib/action_execution_source';
1717

18-
const mockTaskManager = taskManagerMock.start();
18+
const mockTaskManager = taskManagerMock.createStart();
1919
const savedObjectsClient = savedObjectsClientMock.create();
2020
const request = {} as KibanaRequest;
2121

x-pack/plugins/actions/server/usage/actions_usage_collector.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
88
import { registerActionsUsageCollector } from './actions_usage_collector';
9-
import { taskManagerMock } from '../../../task_manager/server/task_manager.mock';
9+
import { taskManagerMock } from '../../../task_manager/server/mocks';
1010

11-
const mockTaskManagerStart = taskManagerMock.start();
11+
const mockTaskManagerStart = taskManagerMock.createStart();
1212

1313
beforeEach(() => jest.resetAllMocks());
1414

x-pack/plugins/alerts/server/alert_type_registry.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import { TaskRunnerFactory } from './task_runner';
88
import { AlertTypeRegistry } from './alert_type_registry';
99
import { AlertType } from './types';
10-
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
10+
import { taskManagerMock } from '../../task_manager/server/mocks';
1111

12-
const taskManager = taskManagerMock.setup();
12+
const taskManager = taskManagerMock.createSetup();
1313
const alertTypeRegistryParams = {
1414
taskManager,
1515
taskRunnerFactory: new TaskRunnerFactory(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { AlertsClient, CreateOptions, ConstructorOptions } from './alerts_client
99
import { savedObjectsClientMock, loggingSystemMock } from '../../../../src/core/server/mocks';
1010
import { nodeTypes } from '../../../../src/plugins/data/common';
1111
import { esKuery } from '../../../../src/plugins/data/server';
12-
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
12+
import { taskManagerMock } from '../../task_manager/server/mocks';
1313
import { alertTypeRegistryMock } from './alert_type_registry.mock';
1414
import { alertsAuthorizationMock } from './authorization/alerts_authorization.mock';
1515
import { TaskStatus } from '../../task_manager/server';
@@ -24,7 +24,7 @@ import { QueryEventsBySavedObjectResult } from '../../event_log/server';
2424
import { SavedObject } from 'kibana/server';
2525
import { EventsFactory } from './lib/alert_instance_summary_from_event_log.test';
2626

27-
const taskManager = taskManagerMock.start();
27+
const taskManager = taskManagerMock.createStart();
2828
const alertTypeRegistry = alertTypeRegistryMock.create();
2929
const unsecuredSavedObjectsClient = savedObjectsClientMock.create();
3030
const eventLogClient = eventLogClientMock.create();

x-pack/plugins/alerts/server/alerts_client_conflict_retries.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { cloneDeep } from 'lodash';
88

99
import { AlertsClient, ConstructorOptions } from './alerts_client';
1010
import { savedObjectsClientMock, loggingSystemMock } from '../../../../src/core/server/mocks';
11-
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
11+
import { taskManagerMock } from '../../task_manager/server/mocks';
1212
import { alertTypeRegistryMock } from './alert_type_registry.mock';
1313
import { alertsAuthorizationMock } from './authorization/alerts_authorization.mock';
1414
import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
@@ -25,7 +25,7 @@ const MockAlertId = 'alert-id';
2525

2626
const ConflictAfterRetries = RetryForConflictsAttempts + 1;
2727

28-
const taskManager = taskManagerMock.start();
28+
const taskManager = taskManagerMock.createStart();
2929
const alertTypeRegistry = alertTypeRegistryMock.create();
3030
const unsecuredSavedObjectsClient = savedObjectsClientMock.create();
3131

x-pack/plugins/alerts/server/alerts_client_factory.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import { Request } from 'hapi';
88
import { AlertsClientFactory, AlertsClientFactoryOpts } from './alerts_client_factory';
99
import { alertTypeRegistryMock } from './alert_type_registry.mock';
10-
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
10+
import { taskManagerMock } from '../../task_manager/server/mocks';
1111
import { KibanaRequest } from '../../../../src/core/server';
1212
import {
1313
savedObjectsClientMock,
@@ -35,7 +35,7 @@ const features = featuresPluginMock.createStart();
3535
const securityPluginSetup = securityMock.createSetup();
3636
const alertsClientFactoryParams: jest.Mocked<AlertsClientFactoryOpts> = {
3737
logger: loggingSystemMock.create().get(),
38-
taskManager: taskManagerMock.start(),
38+
taskManager: taskManagerMock.createStart(),
3939
alertTypeRegistry: alertTypeRegistryMock.create(),
4040
getSpaceId: jest.fn(),
4141
getSpace: jest.fn(),

x-pack/plugins/alerts/server/usage/alerts_usage_collector.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
88
import { registerAlertsUsageCollector } from './alerts_usage_collector';
9-
import { taskManagerMock } from '../../../task_manager/server/task_manager.mock';
10-
const taskManagerStart = taskManagerMock.start();
9+
import { taskManagerMock } from '../../../task_manager/server/mocks';
10+
const taskManagerStart = taskManagerMock.createStart();
1111

1212
beforeEach(() => jest.resetAllMocks());
1313

0 commit comments

Comments
 (0)