Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
ecf3313
Make task manager maxWorkers and pollInterval observables (#75293)
mikecote Aug 21, 2020
afbedee
Merge with upstream
mikecote Aug 21, 2020
9d8393b
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Aug 21, 2020
a8dccf8
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Aug 24, 2020
a038e24
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Aug 31, 2020
71ab831
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 2, 2020
5a1f7ad
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 3, 2020
32468ad
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 8, 2020
d721fea
Make the task manager store emit error events (#75679)
mikecote Sep 9, 2020
2151dd9
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 9, 2020
e0a9fb5
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 14, 2020
5ba478d
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 16, 2020
f7ffe20
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 17, 2020
5f850db
moved TM integration tests to TS
gmmorris Sep 18, 2020
a34dd73
Merge branch 'master' into task-manager/health
gmmorris Sep 18, 2020
375d729
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 21, 2020
c0a7038
introduce health endpoint in TM
gmmorris Sep 22, 2020
76c15a5
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 22, 2020
7e27d7b
added shceduling to health endpoint
gmmorris Sep 23, 2020
0a22c43
fixed tests
gmmorris Sep 23, 2020
7c226e9
fixed typing
gmmorris Sep 23, 2020
e1ee967
fixed typing again
gmmorris Sep 23, 2020
adc3f9f
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 24, 2020
36c717f
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 28, 2020
abec231
added task runtime stats to health endpoint
gmmorris Sep 28, 2020
92cf5ad
Merge branch 'master' into task-manager/health
gmmorris Sep 28, 2020
bf0c3b4
removed unused import
gmmorris Sep 28, 2020
acae863
made task run stats reactive
gmmorris Sep 28, 2020
6b81d56
Merge branch 'master' into task-manager/health
gmmorris Sep 28, 2020
4d34dac
fixed unit tests in health route
gmmorris Sep 28, 2020
d989059
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 29, 2020
e3ba8ad
removed unused import
gmmorris Sep 29, 2020
e7c5da2
added task run duration to health endpoint
gmmorris Sep 29, 2020
192782a
removed mode from TM stats
gmmorris Sep 30, 2020
09bf68e
report run result frequency in tm stats
gmmorris Sep 30, 2020
aa787b6
Temporarily apply back pressure to maxWorkers and pollInterval when 4…
mikecote Sep 30, 2020
3cd8145
Merge branch 'master' of github.com:elastic/kibana into feature/task_…
mikecote Sep 30, 2020
4a5d652
added success and failure ratio
gmmorris Oct 1, 2020
509542d
Fix merge conflicts
mikecote Oct 2, 2020
de5a7ac
added schedule density to Task Manager health
gmmorris Oct 2, 2020
62ceba3
added schedule density to test
gmmorris Oct 5, 2020
1cc8260
added upper bound to schedule density
gmmorris Oct 5, 2020
7b14dff
Merge branch 'master' into task-manager/health
gmmorris Oct 5, 2020
2dca67f
use APM agg types
gmmorris Oct 5, 2020
ae15dc6
fixed tests
gmmorris Oct 5, 2020
734cb12
fixed mock import
gmmorris Oct 5, 2020
db86986
added status on health api
gmmorris Oct 5, 2020
4ca65c3
test status in aceptancve tests
gmmorris Oct 5, 2020
44cb578
corrected types
gmmorris Oct 5, 2020
d29c866
change RGY to OK Error and Warn
gmmorris Oct 5, 2020
273d58d
added readme
gmmorris Oct 6, 2020
2efb599
updated json in readme
gmmorris Oct 6, 2020
911c827
spaces -> tabs
gmmorris Oct 6, 2020
2ab5e73
Added health status in each section
gmmorris Oct 6, 2020
37a4041
removed unused import
gmmorris Oct 6, 2020
5f3847c
Merge branch 'master' into feature/task_manager_429
kibanamachine Oct 6, 2020
8c81a12
replace startsWith with a timer that is scheduled to 0
gmmorris Oct 8, 2020
574e523
Merge branch 'feature/task_manager_429' of github.com:elastic/kibana …
gmmorris Oct 8, 2020
423b8ad
typo
gmmorris Oct 8, 2020
e9dbd08
Merge branch 'master' into feature/task_manager_429
kibanamachine Oct 8, 2020
2f12de5
Merge branch 'master' into task-manager/health
gmmorris Oct 8, 2020
4863391
plug health into service status
gmmorris Oct 8, 2020
7cd7ca6
Merge branch 'master' into task-manager/health
gmmorris Oct 8, 2020
8223188
Merge branch 'master' into task-manager/health
gmmorris Oct 8, 2020
9fc7da6
fixed src import
gmmorris Oct 8, 2020
7403903
estimate recurring tasks in schedule
gmmorris Oct 9, 2020
e47b619
make hot stats refresh rate configurable
gmmorris Oct 12, 2020
6dddf5c
Merge branch 'master' into task-manager/health
gmmorris Oct 12, 2020
7798875
ensure we dont aggregate workload before tm is readyt
gmmorris Oct 12, 2020
3fa42d8
Merge branch 'master' into feature/task_manager_429
kibanamachine Oct 12, 2020
a47c7aa
fixed config mocks
gmmorris Oct 12, 2020
689d014
updated docs
gmmorris Oct 12, 2020
6ec6466
Merge branch 'task-manager/health' into task-manager/health-with-dyna…
gmmorris Oct 12, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions x-pack/plugins/actions/server/action_type_registry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
import { taskManagerMock } from '../../task_manager/server/mocks';
import { ActionTypeRegistry, ActionTypeRegistryOpts } from './action_type_registry';
import { ActionType, ExecutorType } from './types';
import { ActionExecutor, ExecutorError, ILicenseState, TaskRunnerFactory } from './lib';
import { actionsConfigMock } from './actions_config.mock';
import { licenseStateMock } from './lib/license_state.mock';
import { ActionsConfigurationUtilities } from './actions_config';

const mockTaskManager = taskManagerMock.setup();
const mockTaskManager = taskManagerMock.createSetup();
let mockedLicenseState: jest.Mocked<ILicenseState>;
let mockedActionsConfig: jest.Mocked<ActionsConfigurationUtilities>;
let actionTypeRegistryParams: ActionTypeRegistryOpts;
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/actions/server/actions_client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { ActionTypeRegistry, ActionTypeRegistryOpts } from './action_type_regist
import { ActionsClient } from './actions_client';
import { ExecutorType } from './types';
import { ActionExecutor, TaskRunnerFactory, ILicenseState } from './lib';
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
import { taskManagerMock } from '../../task_manager/server/mocks';
import { actionsConfigMock } from './actions_config.mock';
import { getActionsConfigurationUtilities } from './actions_config';
import { licenseStateMock } from './lib/license_state.mock';
Expand All @@ -33,7 +33,7 @@ const authorization = actionsAuthorizationMock.create();
const executionEnqueuer = jest.fn();
const request = {} as KibanaRequest;

const mockTaskManager = taskManagerMock.setup();
const mockTaskManager = taskManagerMock.createSetup();

let actionsClient: ActionsClient;
let mockedLicenseState: jest.Mocked<ILicenseState>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { ActionExecutor, TaskRunnerFactory } from '../lib';
import { ActionTypeRegistry } from '../action_type_registry';
import { taskManagerMock } from '../../../task_manager/server/task_manager.mock';
import { taskManagerMock } from '../../../task_manager/server/mocks';
import { registerBuiltInActionTypes } from './index';
import { Logger } from '../../../../../src/core/server';
import { loggingSystemMock } from '../../../../../src/core/server/mocks';
Expand All @@ -21,7 +21,7 @@ export function createActionTypeRegistry(): {
} {
const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
const actionTypeRegistry = new ActionTypeRegistry({
taskManager: taskManagerMock.setup(),
taskManager: taskManagerMock.createSetup(),
taskRunnerFactory: new TaskRunnerFactory(
new ActionExecutor({ isESOUsingEphemeralEncryptionKey: false })
),
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/actions/server/create_execute_function.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { KibanaRequest } from 'src/core/server';
import uuid from 'uuid';
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
import { taskManagerMock } from '../../task_manager/server/mocks';
import { createExecutionEnqueuerFunction } from './create_execute_function';
import { savedObjectsClientMock } from '../../../../src/core/server/mocks';
import { actionTypeRegistryMock } from './action_type_registry.mock';
Expand All @@ -15,7 +15,7 @@ import {
asSavedObjectExecutionSource,
} from './lib/action_execution_source';

const mockTaskManager = taskManagerMock.start();
const mockTaskManager = taskManagerMock.createStart();
const savedObjectsClient = savedObjectsClientMock.create();
const request = {} as KibanaRequest;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
import { registerActionsUsageCollector } from './actions_usage_collector';
import { taskManagerMock } from '../../../task_manager/server/task_manager.mock';
import { taskManagerMock } from '../../../task_manager/server/mocks';

const mockTaskManagerStart = taskManagerMock.start();
const mockTaskManagerStart = taskManagerMock.createStart();

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

Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/alerts/server/alert_type_registry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import { TaskRunnerFactory } from './task_runner';
import { AlertTypeRegistry } from './alert_type_registry';
import { AlertType } from './types';
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
import { taskManagerMock } from '../../task_manager/server/mocks';

const taskManager = taskManagerMock.setup();
const taskManager = taskManagerMock.createSetup();
const alertTypeRegistryParams = {
taskManager,
taskRunnerFactory: new TaskRunnerFactory(),
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/alerts/server/alerts_client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { AlertsClient, CreateOptions, ConstructorOptions } from './alerts_client
import { savedObjectsClientMock, loggingSystemMock } from '../../../../src/core/server/mocks';
import { nodeTypes } from '../../../../src/plugins/data/common';
import { esKuery } from '../../../../src/plugins/data/server';
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
import { taskManagerMock } from '../../task_manager/server/mocks';
import { alertTypeRegistryMock } from './alert_type_registry.mock';
import { alertsAuthorizationMock } from './authorization/alerts_authorization.mock';
import { TaskStatus } from '../../task_manager/server';
Expand All @@ -24,7 +24,7 @@ import { QueryEventsBySavedObjectResult } from '../../event_log/server';
import { SavedObject } from 'kibana/server';
import { EventsFactory } from './lib/alert_instance_summary_from_event_log.test';

const taskManager = taskManagerMock.start();
const taskManager = taskManagerMock.createStart();
const alertTypeRegistry = alertTypeRegistryMock.create();
const unsecuredSavedObjectsClient = savedObjectsClientMock.create();
const eventLogClient = eventLogClientMock.create();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { cloneDeep } from 'lodash';

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

const ConflictAfterRetries = RetryForConflictsAttempts + 1;

const taskManager = taskManagerMock.start();
const taskManager = taskManagerMock.createStart();
const alertTypeRegistry = alertTypeRegistryMock.create();
const unsecuredSavedObjectsClient = savedObjectsClientMock.create();

Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/alerts/server/alerts_client_factory.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { Request } from 'hapi';
import { AlertsClientFactory, AlertsClientFactoryOpts } from './alerts_client_factory';
import { alertTypeRegistryMock } from './alert_type_registry.mock';
import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
import { taskManagerMock } from '../../task_manager/server/mocks';
import { KibanaRequest } from '../../../../src/core/server';
import {
savedObjectsClientMock,
Expand Down Expand Up @@ -35,7 +35,7 @@ const features = featuresPluginMock.createStart();
const securityPluginSetup = securityMock.createSetup();
const alertsClientFactoryParams: jest.Mocked<AlertsClientFactoryOpts> = {
logger: loggingSystemMock.create().get(),
taskManager: taskManagerMock.start(),
taskManager: taskManagerMock.createStart(),
alertTypeRegistry: alertTypeRegistryMock.create(),
getSpaceId: jest.fn(),
getSpace: jest.fn(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
import { registerAlertsUsageCollector } from './alerts_usage_collector';
import { taskManagerMock } from '../../../task_manager/server/task_manager.mock';
const taskManagerStart = taskManagerMock.start();
import { taskManagerMock } from '../../../task_manager/server/mocks';
const taskManagerStart = taskManagerMock.createStart();

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

Expand Down
21 changes: 21 additions & 0 deletions x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,15 @@ export interface AggregationOptionsByType {
>;
keyed?: boolean;
} & AggregationSourceOptions;
range: {
field: string;
ranges: Array<
| { key?: string; from: string | number }
| { key?: string; to: string | number }
| { key?: string; from: string | number; to: string | number }
>;
keyed?: boolean;
};
auto_date_histogram: {
buckets: number;
} & AggregationSourceOptions;
Expand Down Expand Up @@ -319,6 +328,18 @@ interface AggregationResponsePart<
? Record<string, DateRangeBucket>
: { buckets: DateRangeBucket[] };
};
range: {
buckets: TAggregationOptionsMap extends { range: { keyed: true } }
? Record<
string,
DateRangeBucket &
SubAggregationResponseOf<TAggregationOptionsMap['aggs'], TDocument>
>
: Array<
DateRangeBucket &
SubAggregationResponseOf<TAggregationOptionsMap['aggs'], TDocument>
>;
};
auto_date_histogram: {
buckets: Array<
DateHistogramBucket &
Expand Down
Loading