(
if (route.validate !== false) {
Object.entries(route.validate).forEach(([key, schema]) => {
- if (!(schema instanceof Type || typeof schema === 'function')) {
+ if (!(isConfigSchema(schema) || typeof schema === 'function')) {
throw new Error(
`Expected a valid validation logic declared with '@kbn/config-schema' package or a RouteValidationFunction at key: [${key}].`
);
diff --git a/src/core/server/http/router/validator/validator.ts b/src/core/server/http/router/validator/validator.ts
index 97dd2bc894f81..6c766e69f0f37 100644
--- a/src/core/server/http/router/validator/validator.ts
+++ b/src/core/server/http/router/validator/validator.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { ValidationError, Type, schema, ObjectType } from '@kbn/config-schema';
+import { ValidationError, Type, schema, ObjectType, isConfigSchema } from '@kbn/config-schema';
import { Stream } from 'stream';
import { RouteValidationError } from './validator_error';
@@ -236,7 +236,7 @@ export class RouteValidator {
data?: unknown,
namespace?: string
): RouteValidationResultType {
- if (validationRule instanceof Type) {
+ if (isConfigSchema(validationRule)) {
return validationRule.validate(data, {}, namespace);
} else if (typeof validationRule === 'function') {
return this.validateFunction(validationRule, data, namespace);
diff --git a/src/core/server/legacy/legacy_service.test.mocks.ts b/src/core/server/legacy/legacy_service.test.mocks.ts
index 451a75ced7ae2..9ad554d63add0 100644
--- a/src/core/server/legacy/legacy_service.test.mocks.ts
+++ b/src/core/server/legacy/legacy_service.test.mocks.ts
@@ -30,6 +30,11 @@ export const findLegacyPluginSpecsMock = jest.fn().mockImplementation((settings:
uiExports: {},
navLinks: [],
}));
-jest.doMock('./plugins/find_legacy_plugin_specs.ts', () => ({
+jest.doMock('./plugins/find_legacy_plugin_specs', () => ({
findLegacyPluginSpecs: findLegacyPluginSpecsMock,
}));
+
+export const logLegacyThirdPartyPluginDeprecationWarningMock = jest.fn();
+jest.doMock('./plugins/log_legacy_plugins_warning', () => ({
+ logLegacyThirdPartyPluginDeprecationWarning: logLegacyThirdPartyPluginDeprecationWarningMock,
+}));
diff --git a/src/core/server/legacy/legacy_service.test.ts b/src/core/server/legacy/legacy_service.test.ts
index 0c4e58f6a8da1..a75f7dda302c2 100644
--- a/src/core/server/legacy/legacy_service.test.ts
+++ b/src/core/server/legacy/legacy_service.test.ts
@@ -22,7 +22,10 @@ jest.mock('../../../cli/cluster/cluster_manager');
jest.mock('./config/legacy_deprecation_adapters', () => ({
convertLegacyDeprecationProvider: (provider: any) => Promise.resolve(provider),
}));
-import { findLegacyPluginSpecsMock } from './legacy_service.test.mocks';
+import {
+ findLegacyPluginSpecsMock,
+ logLegacyThirdPartyPluginDeprecationWarningMock,
+} from './legacy_service.test.mocks';
import { BehaviorSubject, throwError } from 'rxjs';
@@ -476,6 +479,38 @@ describe('#discoverPlugins()', () => {
expect(configService.addDeprecationProvider).toHaveBeenCalledWith('', 'providerA');
expect(configService.addDeprecationProvider).toHaveBeenCalledWith('', 'providerB');
});
+
+ it(`logs deprecations for legacy third party plugins`, async () => {
+ const pluginSpecs = [
+ { getId: () => 'pluginA', getDeprecationsProvider: () => undefined },
+ { getId: () => 'pluginB', getDeprecationsProvider: () => undefined },
+ ];
+ findLegacyPluginSpecsMock.mockImplementation(
+ settings =>
+ Promise.resolve({
+ pluginSpecs,
+ pluginExtendedConfig: settings,
+ disabledPluginSpecs: [],
+ uiExports: {},
+ navLinks: [],
+ }) as any
+ );
+
+ const legacyService = new LegacyService({
+ coreId,
+ env,
+ logger,
+ configService: configService as any,
+ });
+
+ await legacyService.discoverPlugins();
+
+ expect(logLegacyThirdPartyPluginDeprecationWarningMock).toHaveBeenCalledTimes(1);
+ expect(logLegacyThirdPartyPluginDeprecationWarningMock).toHaveBeenCalledWith({
+ specs: pluginSpecs,
+ log: expect.any(Object),
+ });
+ });
});
test('Sets the server.uuid property on the legacy configuration', async () => {
diff --git a/src/core/server/legacy/legacy_service.ts b/src/core/server/legacy/legacy_service.ts
index fd3ebfe120599..b95362e1ea26e 100644
--- a/src/core/server/legacy/legacy_service.ts
+++ b/src/core/server/legacy/legacy_service.ts
@@ -28,7 +28,7 @@ import { DevConfig, DevConfigType, config as devConfig } from '../dev';
import { BasePathProxyServer, HttpConfig, HttpConfigType, config as httpConfig } from '../http';
import { Logger } from '../logging';
import { PathConfigType } from '../path';
-import { findLegacyPluginSpecs } from './plugins';
+import { findLegacyPluginSpecs, logLegacyThirdPartyPluginDeprecationWarning } from './plugins';
import { convertLegacyDeprecationProvider } from './config';
import {
ILegacyInternals,
@@ -133,6 +133,11 @@ export class LegacyService implements CoreService {
this.coreContext.env.packageInfo
);
+ logLegacyThirdPartyPluginDeprecationWarning({
+ specs: pluginSpecs,
+ log: this.log,
+ });
+
this.legacyPlugins = {
pluginSpecs,
disabledPluginSpecs,
diff --git a/src/core/server/legacy/plugins/index.ts b/src/core/server/legacy/plugins/index.ts
index a6d55e1da7839..7ec5dbc1983ab 100644
--- a/src/core/server/legacy/plugins/index.ts
+++ b/src/core/server/legacy/plugins/index.ts
@@ -18,3 +18,4 @@
*/
export { findLegacyPluginSpecs } from './find_legacy_plugin_specs';
+export { logLegacyThirdPartyPluginDeprecationWarning } from './log_legacy_plugins_warning';
diff --git a/src/core/server/legacy/plugins/log_legacy_plugins_warning.test.ts b/src/core/server/legacy/plugins/log_legacy_plugins_warning.test.ts
new file mode 100644
index 0000000000000..1790b096a71ae
--- /dev/null
+++ b/src/core/server/legacy/plugins/log_legacy_plugins_warning.test.ts
@@ -0,0 +1,90 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { loggerMock } from '../../logging/logger.mock';
+import { logLegacyThirdPartyPluginDeprecationWarning } from './log_legacy_plugins_warning';
+import { LegacyPluginSpec } from '../types';
+
+const createPluginSpec = ({ id, path }: { id: string; path: string }): LegacyPluginSpec => {
+ return {
+ getId: () => id,
+ getExpectedKibanaVersion: () => 'kibana',
+ getConfigPrefix: () => 'plugin.config',
+ getDeprecationsProvider: () => undefined,
+ getPack: () => ({
+ getPath: () => path,
+ }),
+ };
+};
+
+describe('logLegacyThirdPartyPluginDeprecationWarning', () => {
+ let log: ReturnType;
+
+ beforeEach(() => {
+ log = loggerMock.create();
+ });
+
+ it('logs warning for third party plugins', () => {
+ logLegacyThirdPartyPluginDeprecationWarning({
+ specs: [createPluginSpec({ id: 'plugin', path: '/some-external-path' })],
+ log,
+ });
+ expect(log.warn).toHaveBeenCalledTimes(1);
+ expect(log.warn.mock.calls[0]).toMatchInlineSnapshot(`
+ Array [
+ "Some installed third party plugin(s) [plugin] are using the legacy plugin format and will no longer work in a future Kibana release. Please refer to https://www.elastic.co/guide/en/kibana/master/breaking-changes-8.0.html for a list of breaking changes and https://github.com/elastic/kibana/blob/master/src/core/MIGRATION.md for documentation on how to migrate legacy plugins.",
+ ]
+ `);
+ });
+
+ it('lists all the deprecated plugins and only log once', () => {
+ logLegacyThirdPartyPluginDeprecationWarning({
+ specs: [
+ createPluginSpec({ id: 'pluginA', path: '/abs/path/to/pluginA' }),
+ createPluginSpec({ id: 'pluginB', path: '/abs/path/to/pluginB' }),
+ createPluginSpec({ id: 'pluginC', path: '/abs/path/to/pluginC' }),
+ ],
+ log,
+ });
+ expect(log.warn).toHaveBeenCalledTimes(1);
+ expect(log.warn.mock.calls[0]).toMatchInlineSnapshot(`
+ Array [
+ "Some installed third party plugin(s) [pluginA, pluginB, pluginC] are using the legacy plugin format and will no longer work in a future Kibana release. Please refer to https://www.elastic.co/guide/en/kibana/master/breaking-changes-8.0.html for a list of breaking changes and https://github.com/elastic/kibana/blob/master/src/core/MIGRATION.md for documentation on how to migrate legacy plugins.",
+ ]
+ `);
+ });
+
+ it('does not log warning for internal legacy plugins', () => {
+ logLegacyThirdPartyPluginDeprecationWarning({
+ specs: [
+ createPluginSpec({
+ id: 'plugin',
+ path: '/absolute/path/to/kibana/src/legacy/core_plugins',
+ }),
+ createPluginSpec({
+ id: 'plugin',
+ path: '/absolute/path/to/kibana/x-pack',
+ }),
+ ],
+ log,
+ });
+
+ expect(log.warn).not.toHaveBeenCalled();
+ });
+});
diff --git a/src/core/server/legacy/plugins/log_legacy_plugins_warning.ts b/src/core/server/legacy/plugins/log_legacy_plugins_warning.ts
new file mode 100644
index 0000000000000..f9c3dcbf554cb
--- /dev/null
+++ b/src/core/server/legacy/plugins/log_legacy_plugins_warning.ts
@@ -0,0 +1,52 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Logger } from '../../logging';
+import { LegacyPluginSpec } from '../types';
+
+const internalPaths = ['/src/legacy/core_plugins', '/x-pack'];
+
+const breakingChangesUrl =
+ 'https://www.elastic.co/guide/en/kibana/master/breaking-changes-8.0.html';
+const migrationGuideUrl = 'https://github.com/elastic/kibana/blob/master/src/core/MIGRATION.md';
+
+export const logLegacyThirdPartyPluginDeprecationWarning = ({
+ specs,
+ log,
+}: {
+ specs: LegacyPluginSpec[];
+ log: Logger;
+}) => {
+ const thirdPartySpecs = specs.filter(isThirdPartyPluginSpec);
+ if (thirdPartySpecs.length > 0) {
+ const pluginIds = thirdPartySpecs.map(spec => spec.getId());
+ log.warn(
+ `Some installed third party plugin(s) [${pluginIds.join(
+ ', '
+ )}] are using the legacy plugin format and will no longer work in a future Kibana release. ` +
+ `Please refer to ${breakingChangesUrl} for a list of breaking changes ` +
+ `and ${migrationGuideUrl} for documentation on how to migrate legacy plugins.`
+ );
+ }
+};
+
+const isThirdPartyPluginSpec = (spec: LegacyPluginSpec): boolean => {
+ const pluginPath = spec.getPack().getPath();
+ return !internalPaths.some(internalPath => pluginPath.indexOf(internalPath) > -1);
+};
diff --git a/src/core/server/legacy/types.ts b/src/core/server/legacy/types.ts
index 38cb9e6835ce9..2567ca790e04f 100644
--- a/src/core/server/legacy/types.ts
+++ b/src/core/server/legacy/types.ts
@@ -98,6 +98,7 @@ export interface LegacyPluginSpec {
getExpectedKibanaVersion: () => string;
getConfigPrefix: () => string;
getDeprecationsProvider: () => LegacyConfigDeprecationProvider | undefined;
+ getPack: () => LegacyPluginPack;
}
/**
diff --git a/src/core/server/plugins/plugin.ts b/src/core/server/plugins/plugin.ts
index 7c67ab7a48df1..d7cfaa14d2343 100644
--- a/src/core/server/plugins/plugin.ts
+++ b/src/core/server/plugins/plugin.ts
@@ -21,7 +21,7 @@ import { join } from 'path';
import typeDetect from 'type-detect';
import { Subject } from 'rxjs';
import { first } from 'rxjs/operators';
-import { Type } from '@kbn/config-schema';
+import { isConfigSchema } from '@kbn/config-schema';
import { Logger } from '../logging';
import {
@@ -150,7 +150,7 @@ export class PluginWrapper<
}
const configDescriptor = pluginDefinition.config;
- if (!(configDescriptor.schema instanceof Type)) {
+ if (!isConfigSchema(configDescriptor.schema)) {
throw new Error('Configuration schema expected to be an instance of Type');
}
return configDescriptor;
diff --git a/src/core/server/saved_objects/migrations/core/build_index_map.test.ts b/src/core/server/saved_objects/migrations/core/build_index_map.test.ts
index 44add4e977006..2c710d4eaa079 100644
--- a/src/core/server/saved_objects/migrations/core/build_index_map.test.ts
+++ b/src/core/server/saved_objects/migrations/core/build_index_map.test.ts
@@ -26,7 +26,7 @@ const createRegistry = (...types: Array>) => {
types.forEach(type =>
registry.registerType({
name: 'unknown',
- namespaceAgnostic: false,
+ namespaceType: 'single',
hidden: false,
mappings: { properties: {} },
migrations: {},
@@ -41,7 +41,7 @@ test('mappings without index pattern goes to default index', () => {
kibanaIndexName: '.kibana',
registry: createRegistry({
name: 'type1',
- namespaceAgnostic: false,
+ namespaceType: 'single',
}),
indexMap: {
type1: {
@@ -73,7 +73,7 @@ test(`mappings with custom index pattern doesn't go to default index`, () => {
kibanaIndexName: '.kibana',
registry: createRegistry({
name: 'type1',
- namespaceAgnostic: false,
+ namespaceType: 'single',
indexPattern: '.other_kibana',
}),
indexMap: {
@@ -106,7 +106,7 @@ test('creating a script gets added to the index pattern', () => {
kibanaIndexName: '.kibana',
registry: createRegistry({
name: 'type1',
- namespaceAgnostic: false,
+ namespaceType: 'single',
indexPattern: '.other_kibana',
convertToAliasScript: `ctx._id = ctx._source.type + ':' + ctx._id`,
}),
@@ -141,12 +141,12 @@ test('throws when two scripts are defined for an index pattern', () => {
const registry = createRegistry(
{
name: 'type1',
- namespaceAgnostic: false,
+ namespaceType: 'single',
convertToAliasScript: `ctx._id = ctx._source.type + ':' + ctx._id`,
},
{
name: 'type2',
- namespaceAgnostic: false,
+ namespaceType: 'single',
convertToAliasScript: `ctx._id = ctx._source.type + ':' + ctx._id`,
}
);
diff --git a/src/core/server/saved_objects/migrations/core/document_migrator.test.ts b/src/core/server/saved_objects/migrations/core/document_migrator.test.ts
index ef3f546b5e574..64270c677ff20 100644
--- a/src/core/server/saved_objects/migrations/core/document_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/core/document_migrator.test.ts
@@ -32,7 +32,7 @@ const createRegistry = (...types: Array>) => {
types.forEach(type =>
registry.registerType({
name: 'unknown',
- namespaceAgnostic: false,
+ namespaceType: 'single',
hidden: false,
mappings: { properties: {} },
migrations: {},
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.mock.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.mock.ts
index 257b32c1e4c23..3f5c0c3876615 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.mock.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.mock.ts
@@ -27,7 +27,7 @@ const defaultSavedObjectTypes: SavedObjectsType[] = [
{
name: 'testtype',
hidden: false,
- namespaceAgnostic: false,
+ namespaceType: 'single',
mappings: {
properties: {
name: { type: 'keyword' },
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
index 336eeff99f47b..cda0e86f15bdf 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
@@ -28,8 +28,8 @@ const createRegistry = (types: Array>) => {
types.forEach(type =>
registry.registerType({
name: 'unknown',
- namespaceAgnostic: false,
hidden: false,
+ namespaceType: 'single',
mappings: { properties: {} },
migrations: {},
...type,
@@ -120,7 +120,7 @@ function mockOptions(): KibanaMigratorOptions {
{
name: 'testtype',
hidden: false,
- namespaceAgnostic: false,
+ namespaceType: 'single',
mappings: {
properties: {
name: { type: 'keyword' },
@@ -131,7 +131,7 @@ function mockOptions(): KibanaMigratorOptions {
{
name: 'testtype2',
hidden: false,
- namespaceAgnostic: false,
+ namespaceType: 'single',
indexPattern: 'other-index',
mappings: {
properties: {
diff --git a/src/core/server/saved_objects/routes/integration_tests/test_utils.ts b/src/core/server/saved_objects/routes/integration_tests/test_utils.ts
index 82a889f75d3c1..23e0285201dc7 100644
--- a/src/core/server/saved_objects/routes/integration_tests/test_utils.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/test_utils.ts
@@ -49,7 +49,7 @@ export const createExportableType = (name: string): SavedObjectsType => {
return {
name,
hidden: false,
- namespaceAgnostic: false,
+ namespaceType: 'single',
mappings: {
properties: {},
},
diff --git a/src/core/server/saved_objects/saved_objects_type_registry.test.ts b/src/core/server/saved_objects/saved_objects_type_registry.test.ts
index 84337474f3ee3..f82822f90f489 100644
--- a/src/core/server/saved_objects/saved_objects_type_registry.test.ts
+++ b/src/core/server/saved_objects/saved_objects_type_registry.test.ts
@@ -183,14 +183,6 @@ describe('SavedObjectTypeRegistry', () => {
expectResult(false, { namespaceType: 'single' });
expectResult(false, { namespaceType: undefined });
});
-
- // deprecated test cases
- it(`returns true when namespaceAgnostic is true`, () => {
- expectResult(true, { namespaceAgnostic: true, namespaceType: 'agnostic' });
- expectResult(true, { namespaceAgnostic: true, namespaceType: 'multiple' });
- expectResult(true, { namespaceAgnostic: true, namespaceType: 'single' });
- expectResult(true, { namespaceAgnostic: true, namespaceType: undefined });
- });
});
describe('#isSingleNamespace', () => {
@@ -213,14 +205,6 @@ describe('SavedObjectTypeRegistry', () => {
expectResult(false, { namespaceType: 'agnostic' });
expectResult(false, { namespaceType: 'multiple' });
});
-
- // deprecated test cases
- it(`returns false when namespaceAgnostic is true`, () => {
- expectResult(false, { namespaceAgnostic: true, namespaceType: 'agnostic' });
- expectResult(false, { namespaceAgnostic: true, namespaceType: 'multiple' });
- expectResult(false, { namespaceAgnostic: true, namespaceType: 'single' });
- expectResult(false, { namespaceAgnostic: true, namespaceType: undefined });
- });
});
describe('#isMultiNamespace', () => {
@@ -243,14 +227,6 @@ describe('SavedObjectTypeRegistry', () => {
expectResult(false, { namespaceType: 'single' });
expectResult(false, { namespaceType: undefined });
});
-
- // deprecated test cases
- it(`returns false when namespaceAgnostic is true`, () => {
- expectResult(false, { namespaceAgnostic: true, namespaceType: 'agnostic' });
- expectResult(false, { namespaceAgnostic: true, namespaceType: 'multiple' });
- expectResult(false, { namespaceAgnostic: true, namespaceType: 'single' });
- expectResult(false, { namespaceAgnostic: true, namespaceType: undefined });
- });
});
describe('#isHidden', () => {
diff --git a/src/core/server/saved_objects/saved_objects_type_registry.ts b/src/core/server/saved_objects/saved_objects_type_registry.ts
index be3fdb86a994c..740313a53d1e2 100644
--- a/src/core/server/saved_objects/saved_objects_type_registry.ts
+++ b/src/core/server/saved_objects/saved_objects_type_registry.ts
@@ -72,11 +72,7 @@ export class SavedObjectTypeRegistry {
* resolves to `false` if the type is not registered
*/
public isNamespaceAgnostic(type: string) {
- return (
- this.types.get(type)?.namespaceType === 'agnostic' ||
- this.types.get(type)?.namespaceAgnostic ||
- false
- );
+ return this.types.get(type)?.namespaceType === 'agnostic';
}
/**
@@ -84,6 +80,7 @@ export class SavedObjectTypeRegistry {
* resolves to `true` if the type is not registered
*/
public isSingleNamespace(type: string) {
+ // in the case we somehow registered a type with an invalid `namespaceType`, treat it as single-namespace
return !this.isNamespaceAgnostic(type) && !this.isMultiNamespace(type);
}
@@ -92,7 +89,7 @@ export class SavedObjectTypeRegistry {
* resolves to `false` if the type is not registered
*/
public isMultiNamespace(type: string) {
- return !this.isNamespaceAgnostic(type) && this.types.get(type)?.namespaceType === 'multiple';
+ return this.types.get(type)?.namespaceType === 'multiple';
}
/**
diff --git a/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts b/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts
index a6b580e9b3461..ea881805e1ae6 100644
--- a/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts
+++ b/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts
@@ -32,7 +32,7 @@ describe('SavedObjectsRepository#createRepository', () => {
typeRegistry.registerType({
name: 'nsAgnosticType',
hidden: false,
- namespaceAgnostic: true,
+ namespaceType: 'agnostic',
mappings: {
properties: {
name: { type: 'keyword' },
@@ -44,7 +44,7 @@ describe('SavedObjectsRepository#createRepository', () => {
typeRegistry.registerType({
name: 'nsType',
hidden: false,
- namespaceAgnostic: false,
+ namespaceType: 'single',
indexPattern: 'beats',
mappings: {
properties: {
@@ -56,7 +56,7 @@ describe('SavedObjectsRepository#createRepository', () => {
typeRegistry.registerType({
name: 'hiddenType',
hidden: true,
- namespaceAgnostic: true,
+ namespaceType: 'agnostic',
mappings: {
properties: {
name: { type: 'keyword' },
diff --git a/src/core/server/saved_objects/types.ts b/src/core/server/saved_objects/types.ts
index 9efc82603b179..b50c6dc9a1abf 100644
--- a/src/core/server/saved_objects/types.ts
+++ b/src/core/server/saved_objects/types.ts
@@ -202,15 +202,10 @@ export interface SavedObjectsType {
* See {@link SavedObjectsServiceStart.createInternalRepository | createInternalRepository}.
*/
hidden: boolean;
- /**
- * Is the type global (true), or not (false).
- * @deprecated Use `namespaceType` instead.
- */
- namespaceAgnostic?: boolean;
/**
* The {@link SavedObjectsNamespaceType | namespace type} for the type.
*/
- namespaceType?: SavedObjectsNamespaceType;
+ namespaceType: SavedObjectsNamespaceType;
/**
* If defined, the type instances will be stored in the given index instead of the default one.
*/
diff --git a/src/core/server/saved_objects/utils.test.ts b/src/core/server/saved_objects/utils.test.ts
index 64bdf1771decc..033aeea7c018d 100644
--- a/src/core/server/saved_objects/utils.test.ts
+++ b/src/core/server/saved_objects/utils.test.ts
@@ -421,14 +421,6 @@ describe('convertTypesToLegacySchema', () => {
namespaceType: 'multiple',
mappings: { properties: {} },
},
- // deprecated test case
- {
- name: 'typeD',
- hidden: false,
- namespaceAgnostic: true,
- namespaceType: 'multiple', // if namespaceAgnostic and namespaceType are both set, namespaceAgnostic takes precedence
- mappings: { properties: {} },
- },
];
expect(convertTypesToLegacySchema(types)).toEqual({
typeA: {
@@ -448,12 +440,6 @@ describe('convertTypesToLegacySchema', () => {
isNamespaceAgnostic: false,
multiNamespace: true,
},
- // deprecated test case
- typeD: {
- hidden: false,
- isNamespaceAgnostic: true,
- multiNamespace: false,
- },
});
});
});
diff --git a/src/core/server/saved_objects/utils.ts b/src/core/server/saved_objects/utils.ts
index 5348963812629..af7c08d1fbfcc 100644
--- a/src/core/server/saved_objects/utils.ts
+++ b/src/core/server/saved_objects/utils.ts
@@ -82,8 +82,8 @@ export const convertTypesToLegacySchema = (
return {
...schema,
[type.name]: {
- isNamespaceAgnostic: type.namespaceAgnostic || type.namespaceType === 'agnostic',
- multiNamespace: !type.namespaceAgnostic && type.namespaceType === 'multiple',
+ isNamespaceAgnostic: type.namespaceType === 'agnostic',
+ multiNamespace: type.namespaceType === 'multiple',
hidden: type.hidden,
indexPattern: type.indexPattern,
convertToAliasScript: type.convertToAliasScript,
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index e2af94437c9f3..7ca5c75f19e8f 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -2263,9 +2263,7 @@ export interface SavedObjectsType {
mappings: SavedObjectsTypeMappingDefinition;
migrations?: SavedObjectMigrationMap;
name: string;
- // @deprecated
- namespaceAgnostic?: boolean;
- namespaceType?: SavedObjectsNamespaceType;
+ namespaceType: SavedObjectsNamespaceType;
}
// @public
@@ -2470,11 +2468,11 @@ export const validBodyOutput: readonly ["data", "stream"];
// Warnings were encountered during analysis:
//
// src/core/server/http/router/response.ts:316:3 - (ae-forgotten-export) The symbol "KibanaResponse" needs to be exported by the entry point index.d.ts
-// src/core/server/legacy/types.ts:162:3 - (ae-forgotten-export) The symbol "VarsProvider" needs to be exported by the entry point index.d.ts
-// src/core/server/legacy/types.ts:163:3 - (ae-forgotten-export) The symbol "VarsReplacer" needs to be exported by the entry point index.d.ts
-// src/core/server/legacy/types.ts:164:3 - (ae-forgotten-export) The symbol "LegacyNavLinkSpec" needs to be exported by the entry point index.d.ts
-// src/core/server/legacy/types.ts:165:3 - (ae-forgotten-export) The symbol "LegacyAppSpec" needs to be exported by the entry point index.d.ts
-// src/core/server/legacy/types.ts:166:16 - (ae-forgotten-export) The symbol "LegacyPluginSpec" needs to be exported by the entry point index.d.ts
+// src/core/server/legacy/types.ts:163:3 - (ae-forgotten-export) The symbol "VarsProvider" needs to be exported by the entry point index.d.ts
+// src/core/server/legacy/types.ts:164:3 - (ae-forgotten-export) The symbol "VarsReplacer" needs to be exported by the entry point index.d.ts
+// src/core/server/legacy/types.ts:165:3 - (ae-forgotten-export) The symbol "LegacyNavLinkSpec" needs to be exported by the entry point index.d.ts
+// src/core/server/legacy/types.ts:166:3 - (ae-forgotten-export) The symbol "LegacyAppSpec" needs to be exported by the entry point index.d.ts
+// src/core/server/legacy/types.ts:167:16 - (ae-forgotten-export) The symbol "LegacyPluginSpec" needs to be exported by the entry point index.d.ts
// src/core/server/plugins/types.ts:230:3 - (ae-forgotten-export) The symbol "KibanaConfigType" needs to be exported by the entry point index.d.ts
// src/core/server/plugins/types.ts:230:3 - (ae-forgotten-export) The symbol "SharedGlobalConfigKeys" needs to be exported by the entry point index.d.ts
// src/core/server/plugins/types.ts:232:3 - (ae-forgotten-export) The symbol "PathConfigType" needs to be exported by the entry point index.d.ts
diff --git a/src/core/server/ui_settings/saved_objects/ui_settings.ts b/src/core/server/ui_settings/saved_objects/ui_settings.ts
index 031315bec0dab..1bea65ddee924 100644
--- a/src/core/server/ui_settings/saved_objects/ui_settings.ts
+++ b/src/core/server/ui_settings/saved_objects/ui_settings.ts
@@ -22,7 +22,7 @@ import { SavedObjectsType } from '../../saved_objects';
export const uiSettingsType: SavedObjectsType = {
name: 'config',
hidden: false,
- namespaceAgnostic: false,
+ namespaceType: 'single',
mappings: {
// we don't want to allow `true` in the public `SavedObjectsTypeMappingDefinition` type, however
// this is needed for the config that is kinda a special type. To avoid adding additional internal types
diff --git a/src/dev/storybook/aliases.ts b/src/dev/storybook/aliases.ts
index 8ed64f004c9be..43114b2edccfc 100644
--- a/src/dev/storybook/aliases.ts
+++ b/src/dev/storybook/aliases.ts
@@ -24,6 +24,6 @@ export const storybookAliases = {
drilldowns: 'x-pack/plugins/drilldowns/scripts/storybook.js',
embeddable: 'src/plugins/embeddable/scripts/storybook.js',
infra: 'x-pack/legacy/plugins/infra/scripts/storybook.js',
- siem: 'x-pack/legacy/plugins/siem/scripts/storybook.js',
+ siem: 'x-pack/plugins/siem/scripts/storybook.js',
ui_actions: 'x-pack/plugins/advanced_ui_actions/scripts/storybook.js',
};
diff --git a/src/dev/typescript/projects.ts b/src/dev/typescript/projects.ts
index 34756912fc247..7214741308262 100644
--- a/src/dev/typescript/projects.ts
+++ b/src/dev/typescript/projects.ts
@@ -27,7 +27,7 @@ export const PROJECTS = [
new Project(resolve(REPO_ROOT, 'test/tsconfig.json'), { name: 'kibana/test' }),
new Project(resolve(REPO_ROOT, 'x-pack/tsconfig.json')),
new Project(resolve(REPO_ROOT, 'x-pack/test/tsconfig.json'), { name: 'x-pack/test' }),
- new Project(resolve(REPO_ROOT, 'x-pack/legacy/plugins/siem/cypress/tsconfig.json'), {
+ new Project(resolve(REPO_ROOT, 'x-pack/plugins/siem/cypress/tsconfig.json'), {
name: 'siem/cypress',
}),
new Project(resolve(REPO_ROOT, 'x-pack/legacy/plugins/apm/e2e/tsconfig.json'), {
diff --git a/src/legacy/core_plugins/kibana/index.js b/src/legacy/core_plugins/kibana/index.js
index 1d643418997f5..989583742acd0 100644
--- a/src/legacy/core_plugins/kibana/index.js
+++ b/src/legacy/core_plugins/kibana/index.js
@@ -54,11 +54,7 @@ export default function(kibana) {
},
uiExports: {
- hacks: [
- 'plugins/kibana/discover/legacy',
- 'plugins/kibana/dev_tools',
- 'plugins/kibana/visualize/legacy',
- ],
+ hacks: ['plugins/kibana/discover/legacy', 'plugins/kibana/dev_tools'],
app: {
id: 'kibana',
title: 'Kibana',
diff --git a/src/legacy/core_plugins/kibana/public/index.scss b/src/legacy/core_plugins/kibana/public/index.scss
index fbfb0a06fabcf..d49c59970f521 100644
--- a/src/legacy/core_plugins/kibana/public/index.scss
+++ b/src/legacy/core_plugins/kibana/public/index.scss
@@ -13,8 +13,10 @@
// Discover styles
@import 'discover/index';
-// Visualize styles
-@import './visualize/index';
+// Visualization styles are imported here for running karma Browser tests
+// should be somehow included through the "visualizations" plugin initialization
+@import '../../../../plugins/visualizations/public/index';
+
// Has to come after visualize because of some
// bad cascading in the Editor layout
@import '../../../../plugins/maps_legacy/public/index';
diff --git a/src/legacy/core_plugins/kibana/public/kibana.js b/src/legacy/core_plugins/kibana/public/kibana.js
index 0a026a5e0c310..20c46765dcb30 100644
--- a/src/legacy/core_plugins/kibana/public/kibana.js
+++ b/src/legacy/core_plugins/kibana/public/kibana.js
@@ -43,7 +43,6 @@ import 'uiExports/interpreter';
import 'ui/autoload/all';
import './discover/legacy';
-import './visualize/legacy';
import './management';
import './dev_tools';
import { showAppRedirectNotification } from '../../../../plugins/kibana_legacy/public';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.js.snap
deleted file mode 100644
index 59b275c7708a4..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.js.snap
+++ /dev/null
@@ -1,205 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`CreateIndexPatternWizard defaults to the loading state 1`] = `
-
-
-
-
-
-
-
-`;
-
-exports[`CreateIndexPatternWizard renders index pattern step when there are indices 1`] = `
-
-
-
-
-
-
-
-`;
-
-exports[`CreateIndexPatternWizard renders the empty state when there are no indices 1`] = `
-
-
-
-
-
-
-
-`;
-
-exports[`CreateIndexPatternWizard renders time field step when step is set to 2 1`] = `
-
-
-
-
-
-
-
-`;
-
-exports[`CreateIndexPatternWizard renders when there are no indices but there are remote clusters 1`] = `
-
-
-
-
-
-
-
-`;
-
-exports[`CreateIndexPatternWizard shows system indices even if there are no other indices if the include system indices is toggled 1`] = `
-
-
-
-
-
-
-
-`;
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.tsx.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.tsx.snap
new file mode 100644
index 0000000000000..09a06bd8827ce
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.tsx.snap
@@ -0,0 +1,312 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CreateIndexPatternWizard defaults to the loading state 1`] = `
+
+
+
+
+
+
+
+`;
+
+exports[`CreateIndexPatternWizard renders index pattern step when there are indices 1`] = `
+
+
+
+
+
+
+
+`;
+
+exports[`CreateIndexPatternWizard renders the empty state when there are no indices 1`] = `
+
+
+
+
+
+
+
+`;
+
+exports[`CreateIndexPatternWizard renders time field step when step is set to 2 1`] = `
+
+
+
+
+
+
+
+`;
+
+exports[`CreateIndexPatternWizard renders when there are no indices but there are remote clusters 1`] = `
+
+
+
+
+
+
+
+`;
+
+exports[`CreateIndexPatternWizard shows system indices even if there are no other indices if the include system indices is toggled 1`] = `
+
+
+
+
+
+
+
+`;
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.tsx b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.tsx
index 648bf7f8f9738..d8f677b7f6089 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.tsx
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.tsx
@@ -48,7 +48,7 @@ interface StepIndexPatternProps {
esService: DataPublicPluginStart['search']['__LEGACY']['esClient'];
savedObjectsClient: SavedObjectsClient;
indexPatternCreationType: IndexPatternCreationConfig;
- goToNextStep: () => void;
+ goToNextStep: (query: string) => void;
initialQuery?: string;
uiSettings: IUiSettingsClient;
}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.test.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
similarity index 55%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.test.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
index 941f87d4d9fd2..45af98661eda3 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.test.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx
@@ -21,17 +21,12 @@ import React from 'react';
import { shallow } from 'enzyme';
import { CreateIndexPatternWizard } from './create_index_pattern_wizard';
-const mockIndexPatternCreationType = {
- getIndexPatternType: () => 'default',
- getIndexPatternName: () => 'name',
- getIsBeta: () => false,
- checkIndicesForErrors: () => false,
- getShowSystemIndices: () => false,
- renderPrompt: () => {},
- getIndexPatternMappings: () => {
- return {};
- },
-};
+import { coreMock } from '../../../../../../../../core/public/mocks';
+import { dataPluginMock } from '../../../../../../../../plugins/data/public/mocks';
+import { IndexPatternCreationConfig } from '../../../../../../../../plugins/index_pattern_management/public';
+import { IndexPattern } from '../../../../../../../../plugins/data/public';
+import { SavedObjectsClient } from '../../../../../../../../core/public';
+
jest.mock('./components/step_index_pattern', () => ({ StepIndexPattern: 'StepIndexPattern' }));
jest.mock('./components/step_time_field', () => ({ StepTimeField: 'StepTimeField' }));
jest.mock('./components/header', () => ({ Header: 'Header' }));
@@ -46,39 +41,36 @@ jest.mock('ui/chrome', () => ({
addBasePath: () => {},
}));
-const loadingDataDocUrl = '';
+const { savedObjects, overlays, uiSettings } = coreMock.createStart();
+const { indexPatterns, search } = dataPluginMock.createStartContract();
+const mockIndexPatternCreationType = new IndexPatternCreationConfig({
+ type: 'default',
+ name: 'name',
+});
+
const initialQuery = '';
const services = {
- es: {},
- indexPatterns: {},
- savedObjectsClient: {},
- config: {},
- changeUrl: () => {},
- scopeApply: () => {},
-
+ es: search.__LEGACY.esClient,
+ indexPatterns,
+ savedObjectsClient: savedObjects.client as SavedObjectsClient,
+ uiSettings,
+ changeUrl: jest.fn(),
+ openConfirm: overlays.openConfirm,
indexPatternCreationType: mockIndexPatternCreationType,
};
describe('CreateIndexPatternWizard', () => {
- it(`defaults to the loading state`, async () => {
+ test(`defaults to the loading state`, () => {
const component = shallow(
-
+
);
expect(component).toMatchSnapshot();
});
- it('renders the empty state when there are no indices', async () => {
+ test('renders the empty state when there are no indices', async () => {
const component = shallow(
-
+
);
component.setState({
@@ -91,13 +83,9 @@ describe('CreateIndexPatternWizard', () => {
expect(component).toMatchSnapshot();
});
- it('renders when there are no indices but there are remote clusters', async () => {
+ test('renders when there are no indices but there are remote clusters', async () => {
const component = shallow(
-
+
);
component.setState({
@@ -110,13 +98,9 @@ describe('CreateIndexPatternWizard', () => {
expect(component).toMatchSnapshot();
});
- it('shows system indices even if there are no other indices if the include system indices is toggled', async () => {
+ test('shows system indices even if there are no other indices if the include system indices is toggled', async () => {
const component = shallow(
-
+
);
component.setState({
@@ -129,13 +113,9 @@ describe('CreateIndexPatternWizard', () => {
expect(component).toMatchSnapshot();
});
- it('renders index pattern step when there are indices', async () => {
+ test('renders index pattern step when there are indices', async () => {
const component = shallow(
-
+
);
component.setState({
@@ -147,13 +127,9 @@ describe('CreateIndexPatternWizard', () => {
expect(component).toMatchSnapshot();
});
- it('renders time field step when step is set to 2', async () => {
+ test('renders time field step when step is set to 2', async () => {
const component = shallow(
-
+
);
component.setState({
@@ -166,37 +142,30 @@ describe('CreateIndexPatternWizard', () => {
expect(component).toMatchSnapshot();
});
- it('invokes the provided services when creating an index pattern', async () => {
- const get = jest.fn();
- const set = jest.fn();
+ test('invokes the provided services when creating an index pattern', async () => {
const create = jest.fn().mockImplementation(() => 'id');
const clear = jest.fn();
- const changeUrl = jest.fn();
-
- const component = shallow(
- ({
- create,
- }),
- clearCache: clear,
- },
- changeUrl,
- indexPatternCreationType: mockIndexPatternCreationType,
- }}
- />
+ services.indexPatterns.clearCache = clear;
+ const indexPattern = ({
+ id: '1',
+ title: 'my-fake-index-pattern',
+ timeFieldName: 'timestamp',
+ fields: [],
+ create,
+ } as unknown) as IndexPattern;
+ services.indexPatterns.make = async () => {
+ return indexPattern;
+ };
+
+ const component = shallow(
+
);
component.setState({ indexPattern: 'foo' });
- await component.instance().createIndexPattern(null, 'id');
- expect(get).toBeCalled();
+ await component.instance().createIndexPattern(undefined, 'id');
+ expect(services.uiSettings.get).toBeCalled();
expect(create).toBeCalled();
expect(clear).toBeCalledWith('id');
- expect(changeUrl).toBeCalledWith(`/management/kibana/index_patterns/id`);
+ expect(services.changeUrl).toBeCalledWith(`/management/kibana/index_patterns/id`);
});
});
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.tsx
similarity index 63%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.tsx
index 1a93188edd6cc..4166d48349d35 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.tsx
@@ -17,11 +17,11 @@
* under the License.
*/
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
+import React, { ReactElement, Component } from 'react';
-import { EuiGlobalToastList } from '@elastic/eui';
+import { EuiGlobalToastList, EuiGlobalToastListToast } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
import { StepIndexPattern } from './components/step_index_pattern';
import { StepTimeField } from './components/step_time_field';
@@ -31,41 +31,61 @@ import { EmptyState } from './components/empty_state';
import { MAX_SEARCH_SIZE } from './constants';
import { ensureMinimumTime, getIndices } from './lib';
-import { i18n } from '@kbn/i18n';
-
-export class CreateIndexPatternWizard extends Component {
- static propTypes = {
- initialQuery: PropTypes.string,
- services: PropTypes.shape({
- es: PropTypes.object.isRequired,
- indexPatterns: PropTypes.object.isRequired,
- savedObjectsClient: PropTypes.object.isRequired,
- indexPatternCreationType: PropTypes.object.isRequired,
- config: PropTypes.object.isRequired,
- changeUrl: PropTypes.func.isRequired,
- openConfirm: PropTypes.func.isRequired,
- }).isRequired,
+import {
+ SavedObjectsClient,
+ IUiSettingsClient,
+ OverlayStart,
+} from '../../../../../../../../core/public';
+import { DataPublicPluginStart } from '../../../../../../../../plugins/data/public';
+import { IndexPatternCreationConfig } from '../../../../../../../../plugins/index_pattern_management/public';
+import { MatchedIndex } from './types';
+
+interface CreateIndexPatternWizardProps {
+ initialQuery: string;
+ services: {
+ indexPatternCreationType: IndexPatternCreationConfig;
+ es: DataPublicPluginStart['search']['__LEGACY']['esClient'];
+ indexPatterns: DataPublicPluginStart['indexPatterns'];
+ savedObjectsClient: SavedObjectsClient;
+ uiSettings: IUiSettingsClient;
+ changeUrl: (url: string) => void;
+ openConfirm: OverlayStart['openConfirm'];
};
+}
- constructor(props) {
- super(props);
- this.indexPatternCreationType = this.props.services.indexPatternCreationType;
- this.state = {
- step: 1,
- indexPattern: '',
- allIndices: [],
- remoteClustersExist: false,
- isInitiallyLoadingIndices: true,
- isIncludingSystemIndices: false,
- toasts: [],
- };
- }
+interface CreateIndexPatternWizardState {
+ step: number;
+ indexPattern: string;
+ allIndices: MatchedIndex[];
+ remoteClustersExist: boolean;
+ isInitiallyLoadingIndices: boolean;
+ isIncludingSystemIndices: boolean;
+ toasts: EuiGlobalToastListToast[];
+}
+
+export class CreateIndexPatternWizard extends Component<
+ CreateIndexPatternWizardProps,
+ CreateIndexPatternWizardState
+> {
+ state = {
+ step: 1,
+ indexPattern: '',
+ allIndices: [],
+ remoteClustersExist: false,
+ isInitiallyLoadingIndices: true,
+ isIncludingSystemIndices: false,
+ toasts: [],
+ };
async UNSAFE_componentWillMount() {
this.fetchData();
}
- catchAndWarn = async (asyncFn, errorValue, errorMsg) => {
+ catchAndWarn = async (
+ asyncFn: Promise,
+ errorValue: [] | string[],
+ errorMsg: ReactElement
+ ) => {
try {
return await asyncFn;
} catch (errors) {
@@ -109,22 +129,26 @@ export class CreateIndexPatternWizard extends Component {
// query local and remote indices, updating state independently
ensureMinimumTime(
this.catchAndWarn(
- getIndices(services.es, this.indexPatternCreationType, `*`, MAX_SEARCH_SIZE),
+ getIndices(services.es, services.indexPatternCreationType, `*`, MAX_SEARCH_SIZE),
[],
indicesFailMsg
)
- ).then(allIndices => this.setState({ allIndices, isInitiallyLoadingIndices: false }));
+ ).then((allIndices: MatchedIndex[]) =>
+ this.setState({ allIndices, isInitiallyLoadingIndices: false })
+ );
this.catchAndWarn(
// if we get an error from remote cluster query, supply fallback value that allows user entry.
// ['a'] is fallback value
- getIndices(services.es, this.indexPatternCreationType, `*:*`, 1),
+ getIndices(services.es, services.indexPatternCreationType, `*:*`, 1),
['a'],
clustersFailMsg
- ).then(remoteIndices => this.setState({ remoteClustersExist: !!remoteIndices.length }));
+ ).then((remoteIndices: string[] | MatchedIndex[]) =>
+ this.setState({ remoteClustersExist: !!remoteIndices.length })
+ );
};
- createIndexPattern = async (timeFieldName, indexPatternId) => {
+ createIndexPattern = async (timeFieldName: string | undefined, indexPatternId: string) => {
const { services } = this.props;
const { indexPattern } = this.state;
@@ -134,13 +158,13 @@ export class CreateIndexPatternWizard extends Component {
id: indexPatternId,
title: indexPattern,
timeFieldName,
- ...this.indexPatternCreationType.getIndexPatternMappings(),
+ ...services.indexPatternCreationType.getIndexPatternMappings(),
});
const createdId = await emptyPattern.create();
if (!createdId) {
const confirmMessage = i18n.translate('kbn.management.indexPattern.titleExistsLabel', {
- values: { title: this.title },
+ values: { title: emptyPattern.title },
defaultMessage: "An index pattern with the title '{title}' already exists.",
});
@@ -157,15 +181,15 @@ export class CreateIndexPatternWizard extends Component {
}
}
- if (!services.config.get('defaultIndex')) {
- await services.config.set('defaultIndex', createdId);
+ if (!services.uiSettings.get('defaultIndex')) {
+ await services.uiSettings.set('defaultIndex', createdId);
}
services.indexPatterns.clearCache(createdId);
services.changeUrl(`/management/kibana/index_patterns/${createdId}`);
};
- goToTimeFieldStep = indexPattern => {
+ goToTimeFieldStep = (indexPattern: string) => {
this.setState({ step: 2, indexPattern });
};
@@ -174,22 +198,23 @@ export class CreateIndexPatternWizard extends Component {
};
onChangeIncludingSystemIndices = () => {
- this.setState(state => ({
- isIncludingSystemIndices: !state.isIncludingSystemIndices,
+ this.setState(prevState => ({
+ isIncludingSystemIndices: !prevState.isIncludingSystemIndices,
}));
};
renderHeader() {
const { isIncludingSystemIndices } = this.state;
+ const { services } = this.props;
return (
);
}
@@ -208,7 +233,7 @@ export class CreateIndexPatternWizard extends Component {
return ;
}
- const hasDataIndices = allIndices.some(({ name }) => !name.startsWith('.'));
+ const hasDataIndices = allIndices.some(({ name }: MatchedIndex) => !name.startsWith('.'));
if (!hasDataIndices && !isIncludingSystemIndices && !remoteClustersExist) {
return ;
}
@@ -222,7 +247,7 @@ export class CreateIndexPatternWizard extends Component {
isIncludingSystemIndices={isIncludingSystemIndices}
esService={services.es}
savedObjectsClient={services.savedObjectsClient}
- indexPatternCreationType={this.indexPatternCreationType}
+ indexPatternCreationType={services.indexPatternCreationType}
goToNextStep={this.goToTimeFieldStep}
uiSettings={services.uiSettings}
/>
@@ -237,7 +262,7 @@ export class CreateIndexPatternWizard extends Component {
indexPatternsService={services.indexPatterns}
goToPreviousStep={this.goToIndexPatternStep}
createIndexPattern={this.createIndexPattern}
- indexPatternCreationType={this.indexPatternCreationType}
+ indexPatternCreationType={services.indexPatternCreationType}
/>
);
}
@@ -245,9 +270,9 @@ export class CreateIndexPatternWizard extends Component {
return null;
}
- removeToast = removedToast => {
+ removeToast = (id: string) => {
this.setState(prevState => ({
- toasts: prevState.toasts.filter(toast => toast.id !== removedToast.id),
+ toasts: prevState.toasts.filter(toast => toast.id !== id),
}));
};
@@ -263,7 +288,9 @@ export class CreateIndexPatternWizard extends Component {
{
+ this.removeToast(id);
+ }}
toastLifeTimeMs={6000}
/>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/index.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/index.js
index 47cb773258cb4..ed1fc026c560c 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/index.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/index.js
@@ -36,17 +36,15 @@ uiRoutes.when('/management/kibana/index_pattern', {
$routeParams.type
);
const services = {
- config: npStart.core.uiSettings,
+ uiSettings: npStart.core.uiSettings,
es: npStart.plugins.data.search.__LEGACY.esClient,
indexPatterns: npStart.plugins.data.indexPatterns,
- $http: npStart.core.http,
savedObjectsClient: npStart.core.savedObjects.client,
indexPatternCreationType,
changeUrl: url => {
$scope.$evalAsync(() => kbnUrl.changePath(url));
},
openConfirm: npStart.core.overlays.openConfirm,
- uiSettings: npStart.core.uiSettings,
};
const initialQuery = $routeParams.id ? decodeURIComponent($routeParams.id) : undefined;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/_index.scss
deleted file mode 100644
index 079d82936bb57..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/_index.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-// Visualize plugin styles
-@import 'np_ready/index';
-
-// should be removed while moving the visualize into NP
-@import '../../../../../plugins/vis_default_editor/public/index'
diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
deleted file mode 100644
index f6d73b987912d..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * The imports in this file are static functions and types which still live in legacy folders and are used
- * within dashboard. To consolidate them all in one place, they are re-exported from this file. Eventually
- * this list should become empty. Imports from the top level of shimmed or moved plugins can be imported
- * directly where they are needed.
- */
-
-export { DashboardConstants } from '../../../../../plugins/dashboard/public';
-export {
- VisSavedObject,
- VISUALIZE_EMBEDDABLE_TYPE,
-} from '../../../../../plugins/visualizations/public/';
-export {
- configureAppAngularModule,
- migrateLegacyQuery,
- subscribeWithScope,
-} from '../../../../../plugins/kibana_legacy/public';
diff --git a/src/legacy/core_plugins/timelion/public/app.js b/src/legacy/core_plugins/timelion/public/app.js
index c15318d29e761..7f5c7d4664af8 100644
--- a/src/legacy/core_plugins/timelion/public/app.js
+++ b/src/legacy/core_plugins/timelion/public/app.js
@@ -27,10 +27,11 @@ import { fatalError, toastNotifications } from 'ui/notify';
import { timefilter } from 'ui/timefilter';
import { npStart } from 'ui/new_platform';
import { getSavedSheetBreadcrumbs, getCreateBreadcrumbs } from './breadcrumbs';
-import { getTimezone } from '../../vis_type_timelion/public';
+import { getTimezone } from '../../../../plugins/vis_type_timelion/public';
import 'uiExports/savedObjectTypes';
+require('ui/i18n');
require('ui/autoload/all');
// TODO: remove ui imports completely (move to plugins)
@@ -57,7 +58,7 @@ require('plugins/timelion/directives/timelion_options_sheet');
document.title = 'Timelion - Kibana';
-const app = require('ui/modules').get('apps/timelion', []);
+const app = require('ui/modules').get('apps/timelion', ['i18n', 'ngSanitize']);
require('ui/routes').enable();
diff --git a/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js b/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js
index 57262fda55e48..35ac883e5d99c 100644
--- a/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js
+++ b/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js
@@ -43,7 +43,7 @@
import _ from 'lodash';
import $ from 'jquery';
import PEG from 'pegjs';
-import grammar from 'raw-loader!../../../../../plugins/timelion/common/chain.peg';
+import grammar from 'raw-loader!../../../../../plugins/vis_type_timelion/common/chain.peg';
import timelionExpressionInputTemplate from './timelion_expression_input.html';
import {
SUGGESTION_TYPE,
@@ -52,7 +52,7 @@ import {
insertAtLocation,
} from './timelion_expression_input_helpers';
import { comboBoxKeyCodes } from '@elastic/eui';
-import { getArgValueSuggestions } from '../../../vis_type_timelion/public/helpers/arg_value_suggestions';
+import { npStart } from 'ui/new_platform';
const Parser = PEG.generate(grammar);
@@ -68,7 +68,7 @@ export function TimelionExpInput($http, $timeout) {
replace: true,
template: timelionExpressionInputTemplate,
link: function(scope, elem) {
- const argValueSuggestions = getArgValueSuggestions();
+ const argValueSuggestions = npStart.plugins.visTypeTimelion.getArgValueSuggestions();
const expressionInput = elem.find('[data-expression-input]');
const functionReference = {};
let suggestibleFunctionLocation = {};
diff --git a/src/legacy/core_plugins/timelion/public/panels/timechart/schema.ts b/src/legacy/core_plugins/timelion/public/panels/timechart/schema.ts
index cd40cbfa89ffe..34b389f5ff4ce 100644
--- a/src/legacy/core_plugins/timelion/public/panels/timechart/schema.ts
+++ b/src/legacy/core_plugins/timelion/public/panels/timechart/schema.ts
@@ -17,7 +17,8 @@
* under the License.
*/
-import '../../../../vis_type_timelion/public/flot';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import '../../../../../../plugins/vis_type_timelion/public/flot';
import _ from 'lodash';
import $ from 'jquery';
import moment from 'moment-timezone';
@@ -28,11 +29,14 @@ import {
calculateInterval,
DEFAULT_TIME_FORMAT,
// @ts-ignore
-} from '../../../../../../plugins/timelion/common/lib';
-import { tickFormatters } from '../../../../vis_type_timelion/public/helpers/tick_formatters';
+} from '../../../../../../plugins/vis_type_timelion/common/lib';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { tickFormatters } from '../../../../../../plugins/vis_type_timelion/public/helpers/tick_formatters';
import { TimelionVisualizationDependencies } from '../../plugin';
-import { xaxisFormatterProvider } from '../../../../vis_type_timelion/public/helpers/xaxis_formatter';
-import { generateTicksProvider } from '../../../../vis_type_timelion/public/helpers/tick_generator';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { xaxisFormatterProvider } from '../../../../../../plugins/vis_type_timelion/public/helpers/xaxis_formatter';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { generateTicksProvider } from '../../../../../../plugins/vis_type_timelion/public/helpers/tick_generator';
const DEBOUNCE_DELAY = 50;
diff --git a/src/legacy/core_plugins/vis_type_markdown/index.ts b/src/legacy/core_plugins/vis_type_markdown/index.ts
deleted file mode 100644
index 3c00420e57d55..0000000000000
--- a/src/legacy/core_plugins/vis_type_markdown/index.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-import { Legacy } from 'kibana';
-
-import { LegacyPluginApi, LegacyPluginInitializer } from '../../../../src/legacy/types';
-
-const markdownPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
- new Plugin({
- id: 'markdown_vis',
- require: ['kibana', 'elasticsearch'],
- publicDir: resolve(__dirname, 'public'),
- uiExports: {
- styleSheetPaths: resolve(__dirname, 'public/index.scss'),
- hacks: [resolve(__dirname, 'public/legacy')],
- injectDefaultVars: server => ({}),
- },
- init: (server: Legacy.Server) => ({}),
- config(Joi: any) {
- return Joi.object({
- enabled: Joi.boolean().default(true),
- }).default();
- },
- } as Legacy.PluginSpecOptions);
-
-// eslint-disable-next-line import/no-default-export
-export default markdownPluginInitializer;
diff --git a/src/legacy/core_plugins/vis_type_markdown/package.json b/src/legacy/core_plugins/vis_type_markdown/package.json
deleted file mode 100644
index 5c233d82fe506..0000000000000
--- a/src/legacy/core_plugins/vis_type_markdown/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "name": "markdown_vis",
- "version": "kibana"
-}
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/legacy.ts b/src/legacy/core_plugins/vis_type_markdown/public/legacy.ts
deleted file mode 100644
index 1cfc583f6e005..0000000000000
--- a/src/legacy/core_plugins/vis_type_markdown/public/legacy.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { PluginInitializerContext } from 'kibana/public';
-import { npSetup, npStart } from 'ui/new_platform';
-import { MarkdownPluginSetupDependencies } from './plugin';
-import { plugin } from '.';
-
-const plugins: Readonly = {
- expressions: npSetup.plugins.expressions,
- visualizations: npSetup.plugins.visualizations,
-};
-
-const pluginInstance = plugin({} as PluginInitializerContext);
-
-export const setup = pluginInstance.setup(npSetup.core, plugins);
-export const start = pluginInstance.start(npStart.core);
diff --git a/src/legacy/core_plugins/vis_type_timelion/index.ts b/src/legacy/core_plugins/vis_type_timelion/index.ts
deleted file mode 100644
index 7bca5154c84fd..0000000000000
--- a/src/legacy/core_plugins/vis_type_timelion/index.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-import { Legacy } from 'kibana';
-
-import { LegacyPluginApi, LegacyPluginInitializer } from '../../../../src/legacy/types';
-
-const timelionVisPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
- new Plugin({
- id: 'timelion_vis',
- require: ['kibana', 'elasticsearch'],
- publicDir: resolve(__dirname, 'public'),
- uiExports: {
- styleSheetPaths: resolve(__dirname, 'public/index.scss'),
- hacks: [resolve(__dirname, 'public/legacy')],
- injectDefaultVars: server => ({}),
- },
- init: (server: Legacy.Server) => ({}),
- config(Joi: any) {
- return Joi.object({
- enabled: Joi.boolean().default(true),
- }).default();
- },
- });
-
-// eslint-disable-next-line import/no-default-export
-export default timelionVisPluginInitializer;
diff --git a/src/legacy/core_plugins/vis_type_timelion/package.json b/src/legacy/core_plugins/vis_type_timelion/package.json
deleted file mode 100644
index 9b09f98ce6caf..0000000000000
--- a/src/legacy/core_plugins/vis_type_timelion/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "name": "timelion_vis",
- "version": "kibana"
-}
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/components/_index.scss b/src/legacy/core_plugins/vis_type_timelion/public/components/_index.scss
deleted file mode 100644
index 1d887f43ff9a1..0000000000000
--- a/src/legacy/core_plugins/vis_type_timelion/public/components/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './panel';
-@import './timelion_expression_input';
diff --git a/src/legacy/server/logging/log_reporter.js b/src/legacy/server/logging/log_reporter.js
index 6e62a5ee284e3..b784d03a5b86e 100644
--- a/src/legacy/server/logging/log_reporter.js
+++ b/src/legacy/server/logging/log_reporter.js
@@ -30,7 +30,7 @@ import { LogInterceptor } from './log_interceptor';
// thrown every time we start the server.
// In order to keep using the legacy logger until we remove it I'm just adding
// a new hard limit here.
-process.stdout.setMaxListeners(15);
+process.stdout.setMaxListeners(25);
export function getLoggerStream({ events, config }) {
const squeeze = new Squeeze(events);
diff --git a/src/legacy/ui/public/_index.scss b/src/legacy/ui/public/_index.scss
index 87006d9347de4..aaed52f8b120a 100644
--- a/src/legacy/ui/public/_index.scss
+++ b/src/legacy/ui/public/_index.scss
@@ -17,9 +17,3 @@
@import './field_editor/index';
@import './style_compile/index';
@import '../../../plugins/management/public/components/index';
-
-// The following are prefixed with "vis"
-
-// Can't import vis folder here because of cascading issues, it's imported in core_plugins/kibana
-// @import './vis/index';
-@import './visualize/index';
diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts
index 80fb837258d4c..5ae2e2348aaa1 100644
--- a/src/legacy/ui/public/new_platform/new_platform.ts
+++ b/src/legacy/ui/public/new_platform/new_platform.ts
@@ -69,6 +69,7 @@ import {
VisualizationsSetup,
VisualizationsStart,
} from '../../../../plugins/visualizations/public';
+import { VisTypeTimelionPluginStart } from '../../../../plugins/vis_type_timelion/public';
import { MapsLegacyPluginSetup } from '../../../../plugins/maps_legacy/public';
export interface PluginsSetup {
@@ -116,6 +117,7 @@ export interface PluginsStart {
telemetry?: TelemetryPluginStart;
dashboard: DashboardStart;
savedObjectsManagement: SavedObjectsManagementPluginStart;
+ visTypeTimelion: VisTypeTimelionPluginStart;
indexPatternManagement: IndexPatternManagementStart;
}
diff --git a/src/legacy/ui/public/visualize/_index.scss b/src/legacy/ui/public/visualize/_index.scss
deleted file mode 100644
index d9761f741353b..0000000000000
--- a/src/legacy/ui/public/visualize/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../../plugins/visualizations/public/components/index';
diff --git a/src/plugins/console/server/__tests__/proxy_route/proxy_fallback.test.ts b/src/plugins/console/server/__tests__/proxy_route/proxy_fallback.test.ts
new file mode 100644
index 0000000000000..b226bad11a01a
--- /dev/null
+++ b/src/plugins/console/server/__tests__/proxy_route/proxy_fallback.test.ts
@@ -0,0 +1,64 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { duration } from 'moment';
+import { getProxyRouteHandlerDeps } from './mocks';
+
+import { kibanaResponseFactory } from '../../../../../core/server';
+import { createHandler } from '../../routes/api/console/proxy/create_handler';
+import * as requestModule from '../../lib/proxy_request';
+
+describe('Console Proxy Route', () => {
+ afterEach(async () => {
+ jest.resetAllMocks();
+ });
+
+ describe('fallback behaviour', () => {
+ it('falls back to all configured endpoints regardless of error', async () => {
+ // Describe a situation where all three configured nodes reject
+ (requestModule.proxyRequest as jest.Mock).mockRejectedValueOnce(new Error('ECONNREFUSED'));
+ (requestModule.proxyRequest as jest.Mock).mockRejectedValueOnce(new Error('EHOSTUNREACH'));
+ (requestModule.proxyRequest as jest.Mock).mockRejectedValueOnce(new Error('ESOCKETTIMEDOUT'));
+
+ const handler = createHandler(
+ getProxyRouteHandlerDeps({
+ readLegacyESConfig: () => ({
+ requestTimeout: duration(30000),
+ customHeaders: {},
+ requestHeadersWhitelist: [],
+ hosts: ['http://localhost:9201', 'http://localhost:9202', 'http://localhost:9203'],
+ }),
+ })
+ );
+
+ const response = await handler(
+ {} as any,
+ {
+ headers: {},
+ query: { method: 'get', path: 'test' },
+ } as any,
+ kibanaResponseFactory
+ );
+
+ expect(response.status).toBe(502);
+ // Return the message from the ES node we attempted last.
+ expect(response.payload.message).toBe('ESOCKETTIMEDOUT');
+ });
+ });
+});
diff --git a/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.put_settings.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.put_settings.json
index 408b01c4cb8f5..0da2c130b47cf 100644
--- a/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.put_settings.json
+++ b/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.put_settings.json
@@ -59,7 +59,61 @@
}
},
"transient": {
- "__scope_link": ".persistent"
+ "cluster": {
+ "routing": {
+ "allocation.enable": {
+ "__one_of": ["all", "primaries", "new_primaries", "none"]
+ },
+ "allocation.disk.threshold_enabled": { "__one_of": [false, true] },
+ "allocation.disk.watermark.low": "85%",
+ "allocation.disk.watermark.high": "90%",
+ "allocation.disk.reroute_interval": "60s",
+ "allocation.exclude": {
+ "_ip": "",
+ "_name": "",
+ "_host": "",
+ "_id": ""
+ },
+ "allocation.include": {
+ "_ip": "",
+ "_name": "",
+ "_host": "",
+ "_id": ""
+ },
+ "allocation.require": {
+ "_ip": "",
+ "_name": "",
+ "_host": "",
+ "_id": ""
+ },
+ "allocation.awareness.attributes": [],
+ "allocation.awareness.force": {
+ "*": {
+ "values": []
+ }
+ },
+ "allocation.allow_rebalance": {
+ "__one_of": [
+ "always",
+ "indices_primaries_active",
+ "indices_all_active"
+ ]
+ },
+ "allocation.cluster_concurrent_rebalance": 2,
+ "allocation.node_initial_primaries_recoveries": 4,
+ "allocation.node_concurrent_recoveries": 2,
+ "allocation.same_shard.host": { "__one_of": [false, true] }
+ }
+ },
+ "indices": {
+ "breaker": {
+ "total.limit": "70%",
+ "fielddata.limit": "60%",
+ "fielddata.overhead": 1.03,
+ "request.limit": "40%",
+ "request.overhead": 1.0
+ }
+ }
}
}
}
diff --git a/src/plugins/console/server/routes/api/console/proxy/create_handler.ts b/src/plugins/console/server/routes/api/console/proxy/create_handler.ts
index 50a9fcf03c209..9446289ff03ea 100644
--- a/src/plugins/console/server/routes/api/console/proxy/create_handler.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/create_handler.ts
@@ -175,10 +175,9 @@ export const createHandler = ({
break;
} catch (e) {
+ // If we reached here it means we hit a lower level network issue than just, for e.g., a 500.
+ // We try contacting another node in that case.
log.error(e);
- if (e.code !== 'ECONNREFUSED') {
- return response.internalError(e);
- }
if (idx === hosts.length - 1) {
log.warn(`Could not connect to any configured ES node [${hosts.join(', ')}]`);
return response.customError({
diff --git a/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx b/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx
new file mode 100644
index 0000000000000..17943333d25b0
--- /dev/null
+++ b/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx
@@ -0,0 +1,155 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { isErrorEmbeddable, IContainer } from '../../embeddable_plugin';
+import { DashboardContainer, DashboardPanelState } from '../embeddable';
+import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
+import {
+ CONTACT_CARD_EMBEDDABLE,
+ ContactCardEmbeddableFactory,
+ ContactCardEmbeddable,
+ ContactCardEmbeddableInput,
+ ContactCardEmbeddableOutput,
+} from '../../embeddable_plugin_test_samples';
+import { coreMock } from '../../../../../core/public/mocks';
+import { CoreStart } from 'kibana/public';
+import { ClonePanelAction } from '.';
+
+// eslint-disable-next-line
+import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+
+const { setup, doStart } = embeddablePluginMock.createInstance();
+setup.registerEmbeddableFactory(
+ CONTACT_CARD_EMBEDDABLE,
+ new ContactCardEmbeddableFactory((() => null) as any, {} as any)
+);
+const start = doStart();
+
+let container: DashboardContainer;
+let embeddable: ContactCardEmbeddable;
+let coreStart: CoreStart;
+beforeEach(async () => {
+ coreStart = coreMock.createStart();
+ coreStart.savedObjects.client = {
+ ...coreStart.savedObjects.client,
+ get: jest.fn().mockImplementation(() => ({ attributes: { title: 'Holy moly' } })),
+ find: jest.fn().mockImplementation(() => ({ total: 15 })),
+ create: jest.fn().mockImplementation(() => ({ id: 'brandNewSavedObject' })),
+ };
+
+ const options = {
+ ExitFullScreenButton: () => null,
+ SavedObjectFinder: () => null,
+ application: {} as any,
+ embeddable: start,
+ inspector: {} as any,
+ notifications: {} as any,
+ overlays: coreStart.overlays,
+ savedObjectMetaData: {} as any,
+ uiActions: {} as any,
+ };
+ const input = getSampleDashboardInput({
+ panels: {
+ '123': getSampleDashboardPanel({
+ explicitInput: { firstName: 'Kibanana', id: '123' },
+ type: CONTACT_CARD_EMBEDDABLE,
+ }),
+ },
+ });
+ container = new DashboardContainer(input, options);
+
+ const contactCardEmbeddable = await container.addNewEmbeddable<
+ ContactCardEmbeddableInput,
+ ContactCardEmbeddableOutput,
+ ContactCardEmbeddable
+ >(CONTACT_CARD_EMBEDDABLE, {
+ firstName: 'Kibana',
+ });
+
+ if (isErrorEmbeddable(contactCardEmbeddable)) {
+ throw new Error('Failed to create embeddable');
+ } else {
+ embeddable = contactCardEmbeddable;
+ }
+});
+
+test('Clone adds a new embeddable', async () => {
+ const dashboard = embeddable.getRoot() as IContainer;
+ const originalPanelCount = Object.keys(dashboard.getInput().panels).length;
+ const originalPanelKeySet = new Set(Object.keys(dashboard.getInput().panels));
+ const action = new ClonePanelAction(coreStart);
+ await action.execute({ embeddable });
+ expect(Object.keys(container.getInput().panels).length).toEqual(originalPanelCount + 1);
+ const newPanelId = Object.keys(container.getInput().panels).find(
+ key => !originalPanelKeySet.has(key)
+ );
+ expect(newPanelId).toBeDefined();
+ const newPanel = container.getInput().panels[newPanelId!];
+ expect(newPanel.type).toEqual(embeddable.type);
+});
+
+test('Clones an embeddable without a saved object ID', async () => {
+ const dashboard = embeddable.getRoot() as IContainer;
+ const panel = dashboard.getInput().panels[embeddable.id] as DashboardPanelState;
+ const action = new ClonePanelAction(coreStart);
+ // @ts-ignore
+ const newPanel = await action.cloneEmbeddable(panel, embeddable.type);
+ expect(newPanel.type).toEqual(embeddable.type);
+});
+
+test('Clones an embeddable with a saved object ID', async () => {
+ const dashboard = embeddable.getRoot() as IContainer;
+ const panel = dashboard.getInput().panels[embeddable.id] as DashboardPanelState;
+ panel.explicitInput.savedObjectId = 'holySavedObjectBatman';
+ const action = new ClonePanelAction(coreStart);
+ // @ts-ignore
+ const newPanel = await action.cloneEmbeddable(panel, embeddable.type);
+ expect(coreStart.savedObjects.client.get).toHaveBeenCalledTimes(1);
+ expect(coreStart.savedObjects.client.find).toHaveBeenCalledTimes(1);
+ expect(coreStart.savedObjects.client.create).toHaveBeenCalledTimes(1);
+ expect(newPanel.type).toEqual(embeddable.type);
+});
+
+test('Gets a unique title ', async () => {
+ coreStart.savedObjects.client.find = jest.fn().mockImplementation(({ search }) => {
+ if (search === '"testFirstTitle"') return { total: 1 };
+ else if (search === '"testSecondTitle"') return { total: 41 };
+ else if (search === '"testThirdTitle"') return { total: 90 };
+ });
+ const action = new ClonePanelAction(coreStart);
+ // @ts-ignore
+ expect(await action.getUniqueTitle('testFirstTitle', embeddable.type)).toEqual(
+ 'testFirstTitle (copy)'
+ );
+ // @ts-ignore
+ expect(await action.getUniqueTitle('testSecondTitle (copy 39)', embeddable.type)).toEqual(
+ 'testSecondTitle (copy 40)'
+ );
+ // @ts-ignore
+ expect(await action.getUniqueTitle('testSecondTitle (copy 20)', embeddable.type)).toEqual(
+ 'testSecondTitle (copy 40)'
+ );
+ // @ts-ignore
+ expect(await action.getUniqueTitle('testThirdTitle', embeddable.type)).toEqual(
+ 'testThirdTitle (copy 89)'
+ );
+ // @ts-ignore
+ expect(await action.getUniqueTitle('testThirdTitle (copy 10000)', embeddable.type)).toEqual(
+ 'testThirdTitle (copy 89)'
+ );
+});
diff --git a/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx b/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx
new file mode 100644
index 0000000000000..4d15e7e899fa8
--- /dev/null
+++ b/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx
@@ -0,0 +1,158 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { CoreStart } from 'src/core/public';
+import uuid from 'uuid';
+import { ActionByType, IncompatibleActionError } from '../../ui_actions_plugin';
+import { ViewMode, PanelState, IEmbeddable } from '../../embeddable_plugin';
+import { SavedObject } from '../../../../saved_objects/public';
+import { PanelNotFoundError, EmbeddableInput } from '../../../../embeddable/public';
+import {
+ placePanelBeside,
+ IPanelPlacementBesideArgs,
+} from '../embeddable/panel/dashboard_panel_placement';
+import { DashboardPanelState, DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '..';
+
+export const ACTION_CLONE_PANEL = 'clonePanel';
+
+export interface ClonePanelActionContext {
+ embeddable: IEmbeddable;
+}
+
+export class ClonePanelAction implements ActionByType {
+ public readonly type = ACTION_CLONE_PANEL;
+ public readonly id = ACTION_CLONE_PANEL;
+ public order = 11;
+
+ constructor(private core: CoreStart) {}
+
+ public getDisplayName({ embeddable }: ClonePanelActionContext) {
+ if (!embeddable.getRoot() || !embeddable.getRoot().isContainer) {
+ throw new IncompatibleActionError();
+ }
+ return i18n.translate('dashboard.panel.clonePanel', {
+ defaultMessage: 'Clone panel',
+ });
+ }
+
+ public getIconType({ embeddable }: ClonePanelActionContext) {
+ if (!embeddable.getRoot() || !embeddable.getRoot().isContainer) {
+ throw new IncompatibleActionError();
+ }
+ return 'copy';
+ }
+
+ public async isCompatible({ embeddable }: ClonePanelActionContext) {
+ return Boolean(
+ embeddable.getInput()?.viewMode !== ViewMode.VIEW &&
+ embeddable.getRoot() &&
+ embeddable.getRoot().isContainer &&
+ embeddable.getRoot().type === DASHBOARD_CONTAINER_TYPE
+ );
+ }
+
+ public async execute({ embeddable }: ClonePanelActionContext) {
+ if (!embeddable.getRoot() || !embeddable.getRoot().isContainer) {
+ throw new IncompatibleActionError();
+ }
+
+ const dashboard = embeddable.getRoot() as DashboardContainer;
+ const panelToClone = dashboard.getInput().panels[embeddable.id] as DashboardPanelState;
+ if (!panelToClone) {
+ throw new PanelNotFoundError();
+ }
+
+ dashboard.showPlaceholderUntil(
+ this.cloneEmbeddable(panelToClone, embeddable.type),
+ placePanelBeside,
+ {
+ width: panelToClone.gridData.w,
+ height: panelToClone.gridData.h,
+ currentPanels: dashboard.getInput().panels,
+ placeBesideId: panelToClone.explicitInput.id,
+ } as IPanelPlacementBesideArgs
+ );
+ }
+
+ private async getUniqueTitle(rawTitle: string, embeddableType: string): Promise {
+ const clonedTag = i18n.translate('dashboard.panel.title.clonedTag', {
+ defaultMessage: 'copy',
+ });
+ const cloneRegex = new RegExp(`\\(${clonedTag}\\)`, 'g');
+ const cloneNumberRegex = new RegExp(`\\(${clonedTag} [0-9]+\\)`, 'g');
+ const baseTitle = rawTitle
+ .replace(cloneNumberRegex, '')
+ .replace(cloneRegex, '')
+ .trim();
+
+ const similarSavedObjects = await this.core.savedObjects.client.find({
+ type: embeddableType,
+ perPage: 0,
+ fields: ['title'],
+ searchFields: ['title'],
+ search: `"${baseTitle}"`,
+ });
+ const similarBaseTitlesCount: number = similarSavedObjects.total - 1;
+
+ return similarBaseTitlesCount <= 0
+ ? baseTitle + ` (${clonedTag})`
+ : baseTitle + ` (${clonedTag} ${similarBaseTitlesCount})`;
+ }
+
+ private async cloneEmbeddable(
+ panelToClone: DashboardPanelState,
+ embeddableType: string
+ ): Promise> {
+ const panelState: PanelState = {
+ type: embeddableType,
+ explicitInput: {
+ ...panelToClone.explicitInput,
+ id: uuid.v4(),
+ },
+ };
+ let newTitle: string = '';
+ if (panelToClone.explicitInput.savedObjectId) {
+ // Fetch existing saved object
+ const savedObjectToClone = await this.core.savedObjects.client.get(
+ embeddableType,
+ panelToClone.explicitInput.savedObjectId
+ );
+
+ // Clone the saved object
+ newTitle = await this.getUniqueTitle(savedObjectToClone.attributes.title, embeddableType);
+ const clonedSavedObject = await this.core.savedObjects.client.create(
+ embeddableType,
+ {
+ ..._.cloneDeep(savedObjectToClone.attributes),
+ title: newTitle,
+ },
+ { references: _.cloneDeep(savedObjectToClone.references) }
+ );
+ panelState.explicitInput.savedObjectId = clonedSavedObject.id;
+ }
+ this.core.notifications.toasts.addSuccess({
+ title: i18n.translate('dashboard.panel.clonedToast', {
+ defaultMessage: 'Cloned panel',
+ }),
+ 'data-test-subj': 'addObjectToContainerSuccess',
+ });
+ return panelState;
+ }
+}
diff --git a/src/plugins/dashboard/public/application/actions/index.ts b/src/plugins/dashboard/public/application/actions/index.ts
index 23c26dbd280f8..d7a84fb79f6af 100644
--- a/src/plugins/dashboard/public/application/actions/index.ts
+++ b/src/plugins/dashboard/public/application/actions/index.ts
@@ -27,3 +27,8 @@ export {
ReplacePanelActionContext,
ACTION_REPLACE_PANEL,
} from './replace_panel_action';
+export {
+ ClonePanelAction,
+ ClonePanelActionContext,
+ ACTION_CLONE_PANEL,
+} from './clone_panel_action';
diff --git a/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx
index 50089f1f061f4..8346fd900caef 100644
--- a/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx
@@ -23,6 +23,7 @@ import { I18nProvider } from '@kbn/i18n/react';
import { RefreshInterval, TimeRange, Query, Filter } from 'src/plugins/data/public';
import { CoreStart } from 'src/core/public';
import { Start as InspectorStartContract } from 'src/plugins/inspector/public';
+import uuid from 'uuid';
import { UiActionsStart } from '../../ui_actions_plugin';
import {
Container,
@@ -32,6 +33,7 @@ import {
EmbeddableFactory,
IEmbeddable,
EmbeddableStart,
+ PanelState,
} from '../../embeddable_plugin';
import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants';
import { createPanelState } from './panel';
@@ -42,6 +44,8 @@ import {
KibanaReactContext,
KibanaReactContextValue,
} from '../../../../kibana_react/public';
+import { PLACEHOLDER_EMBEDDABLE } from './placeholder';
+import { PanelPlacementMethod, IPanelPlacementArgs } from './panel/dashboard_panel_placement';
export interface DashboardContainerInput extends ContainerInput {
viewMode: ViewMode;
@@ -120,7 +124,61 @@ export class DashboardContainer extends Container = {}
): DashboardPanelState {
const panelState = super.createNewPanelState(factory, partial);
- return createPanelState(panelState, Object.values(this.input.panels));
+ return createPanelState(panelState, this.input.panels);
+ }
+
+ public showPlaceholderUntil(
+ newStateComplete: Promise>,
+ placementMethod?: PanelPlacementMethod,
+ placementArgs?: TPlacementMethodArgs
+ ): void {
+ const originalPanelState = {
+ type: PLACEHOLDER_EMBEDDABLE,
+ explicitInput: {
+ id: uuid.v4(),
+ disabledActions: [
+ 'ACTION_CUSTOMIZE_PANEL',
+ 'CUSTOM_TIME_RANGE',
+ 'clonePanel',
+ 'replacePanel',
+ 'togglePanel',
+ ],
+ },
+ } as PanelState;
+ const placeholderPanelState = createPanelState(
+ originalPanelState,
+ this.input.panels,
+ placementMethod,
+ placementArgs
+ );
+ this.updateInput({
+ panels: {
+ ...this.input.panels,
+ [placeholderPanelState.explicitInput.id]: placeholderPanelState,
+ },
+ });
+ newStateComplete.then((newPanelState: Partial) => {
+ const finalPanels = { ...this.input.panels };
+ delete finalPanels[placeholderPanelState.explicitInput.id];
+ const newPanelId = newPanelState.explicitInput?.id
+ ? newPanelState.explicitInput.id
+ : uuid.v4();
+ finalPanels[newPanelId] = {
+ ...placeholderPanelState,
+ ...newPanelState,
+ gridData: {
+ ...placeholderPanelState.gridData,
+ i: newPanelId,
+ },
+ explicitInput: {
+ ...newPanelState.explicitInput,
+ id: newPanelId,
+ },
+ };
+ this.updateInput({
+ panels: finalPanels,
+ });
+ });
}
public render(dom: HTMLElement) {
diff --git a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts
index 409cae8b49a53..7c11ac8a5031b 100644
--- a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts
+++ b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts
@@ -26,7 +26,7 @@ import { CONTACT_CARD_EMBEDDABLE } from '../../../embeddable_plugin_test_samples
interface TestInput extends EmbeddableInput {
test: string;
}
-const panels: DashboardPanelState[] = [];
+const panels: { [key: string]: DashboardPanelState } = {};
test('createPanelState adds a new panel state in 0,0 position', () => {
const panelState = createPanelState(
@@ -34,7 +34,7 @@ test('createPanelState adds a new panel state in 0,0 position', () => {
type: CONTACT_CARD_EMBEDDABLE,
explicitInput: { test: 'hi', id: '123' },
},
- []
+ panels
);
expect(panelState.explicitInput.test).toBe('hi');
expect(panelState.type).toBe(CONTACT_CARD_EMBEDDABLE);
@@ -44,7 +44,7 @@ test('createPanelState adds a new panel state in 0,0 position', () => {
expect(panelState.gridData.h).toBe(DEFAULT_PANEL_HEIGHT);
expect(panelState.gridData.w).toBe(DEFAULT_PANEL_WIDTH);
- panels.push(panelState);
+ panels[panelState.explicitInput.id] = panelState;
});
test('createPanelState adds a second new panel state', () => {
@@ -58,7 +58,7 @@ test('createPanelState adds a second new panel state', () => {
expect(panelState.gridData.h).toBe(DEFAULT_PANEL_HEIGHT);
expect(panelState.gridData.w).toBe(DEFAULT_PANEL_WIDTH);
- panels.push(panelState);
+ panels[panelState.explicitInput.id] = panelState;
});
test('createPanelState adds a third new panel state', () => {
@@ -74,17 +74,17 @@ test('createPanelState adds a third new panel state', () => {
expect(panelState.gridData.h).toBe(DEFAULT_PANEL_HEIGHT);
expect(panelState.gridData.w).toBe(DEFAULT_PANEL_WIDTH);
- panels.push(panelState);
+ panels[panelState.explicitInput.id] = panelState;
});
test('createPanelState adds a new panel state in the top most position', () => {
- const panelsWithEmptySpace = panels.filter(panel => panel.gridData.x === 0);
+ delete panels['456'];
const panelState = createPanelState(
{
type: CONTACT_CARD_EMBEDDABLE,
explicitInput: { test: 'bye', id: '987' },
},
- panelsWithEmptySpace
+ panels
);
expect(panelState.gridData.x).toBe(DEFAULT_PANEL_WIDTH);
expect(panelState.gridData.y).toBe(0);
diff --git a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts
index f3a48368fe1b3..79116a57869d3 100644
--- a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts
+++ b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts
@@ -19,98 +19,45 @@
import _ from 'lodash';
import { PanelState, EmbeddableInput } from '../../../embeddable_plugin';
-import {
- DASHBOARD_GRID_COLUMN_COUNT,
- DEFAULT_PANEL_HEIGHT,
- DEFAULT_PANEL_WIDTH,
-} from '../dashboard_constants';
+import { DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH } from '../dashboard_constants';
import { DashboardPanelState } from '../types';
-
-// Look for the smallest y and x value where the default panel will fit.
-function findTopLeftMostOpenSpace(
- width: number,
- height: number,
- currentPanels: DashboardPanelState[]
-) {
- let maxY = -1;
-
- currentPanels.forEach(panel => {
- maxY = Math.max(panel.gridData.y + panel.gridData.h, maxY);
- });
-
- // Handle case of empty grid.
- if (maxY < 0) {
- return { x: 0, y: 0 };
- }
-
- const grid = new Array(maxY);
- for (let y = 0; y < maxY; y++) {
- grid[y] = new Array(DASHBOARD_GRID_COLUMN_COUNT).fill(0);
- }
-
- currentPanels.forEach(panel => {
- for (let x = panel.gridData.x; x < panel.gridData.x + panel.gridData.w; x++) {
- for (let y = panel.gridData.y; y < panel.gridData.y + panel.gridData.h; y++) {
- const row = grid[y];
- if (row === undefined) {
- throw new Error(
- `Attempted to access a row that doesn't exist at ${y} for panel ${JSON.stringify(
- panel
- )}`
- );
- }
- grid[y][x] = 1;
- }
- }
- });
-
- for (let y = 0; y < maxY; y++) {
- for (let x = 0; x < DASHBOARD_GRID_COLUMN_COUNT; x++) {
- if (grid[y][x] === 1) {
- // Space is filled
- continue;
- } else {
- for (let h = y; h < Math.min(y + height, maxY); h++) {
- for (let w = x; w < Math.min(x + width, DASHBOARD_GRID_COLUMN_COUNT); w++) {
- const spaceIsEmpty = grid[h][w] === 0;
- const fitsPanelWidth = w === x + width - 1;
- // If the panel is taller than any other panel in the current grid, it can still fit in the space, hence
- // we check the minimum of maxY and the panel height.
- const fitsPanelHeight = h === Math.min(y + height - 1, maxY - 1);
-
- if (spaceIsEmpty && fitsPanelWidth && fitsPanelHeight) {
- // Found space
- return { x, y };
- } else if (grid[h][w] === 1) {
- // x, y spot doesn't work, break.
- break;
- }
- }
- }
- }
- }
- }
- return { x: 0, y: maxY };
-}
+import {
+ IPanelPlacementArgs,
+ findTopLeftMostOpenSpace,
+ PanelPlacementMethod,
+} from './dashboard_panel_placement';
/**
* Creates and initializes a basic panel state.
*/
-export function createPanelState(
+export function createPanelState<
+ TEmbeddableInput extends EmbeddableInput,
+ TPlacementMethodArgs extends IPanelPlacementArgs = IPanelPlacementArgs
+>(
panelState: PanelState,
- currentPanels: DashboardPanelState[]
+ currentPanels: { [key: string]: DashboardPanelState },
+ placementMethod?: PanelPlacementMethod,
+ placementArgs?: TPlacementMethodArgs
): DashboardPanelState {
- const { x, y } = findTopLeftMostOpenSpace(
- DEFAULT_PANEL_WIDTH,
- DEFAULT_PANEL_HEIGHT,
- currentPanels
- );
+ const defaultPlacementArgs = {
+ width: DEFAULT_PANEL_WIDTH,
+ height: DEFAULT_PANEL_HEIGHT,
+ currentPanels,
+ };
+ const finalPlacementArgs = placementArgs
+ ? {
+ ...defaultPlacementArgs,
+ ...placementArgs,
+ }
+ : defaultPlacementArgs;
+
+ const gridDataLocation = placementMethod
+ ? placementMethod(finalPlacementArgs as TPlacementMethodArgs)
+ : findTopLeftMostOpenSpace(defaultPlacementArgs);
+
return {
gridData: {
- w: DEFAULT_PANEL_WIDTH,
- h: DEFAULT_PANEL_HEIGHT,
- x,
- y,
+ ...gridDataLocation,
i: panelState.explicitInput.id,
},
...panelState,
diff --git a/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts b/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts
new file mode 100644
index 0000000000000..70a6c83418587
--- /dev/null
+++ b/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts
@@ -0,0 +1,167 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PanelNotFoundError } from '../../../embeddable_plugin';
+import { DashboardPanelState, GridData, DASHBOARD_GRID_COLUMN_COUNT } from '..';
+
+export type PanelPlacementMethod = (
+ args: PlacementArgs
+) => Omit;
+
+export interface IPanelPlacementArgs {
+ width: number;
+ height: number;
+ currentPanels: { [key: string]: DashboardPanelState };
+}
+
+export interface IPanelPlacementBesideArgs extends IPanelPlacementArgs {
+ placeBesideId: string;
+}
+
+// Look for the smallest y and x value where the default panel will fit.
+export function findTopLeftMostOpenSpace({
+ width,
+ height,
+ currentPanels,
+}: IPanelPlacementArgs): Omit {
+ let maxY = -1;
+
+ const currentPanelsArray = Object.values(currentPanels);
+ currentPanelsArray.forEach(panel => {
+ maxY = Math.max(panel.gridData.y + panel.gridData.h, maxY);
+ });
+
+ // Handle case of empty grid.
+ if (maxY < 0) {
+ return { x: 0, y: 0, w: width, h: height };
+ }
+
+ const grid = new Array(maxY);
+ for (let y = 0; y < maxY; y++) {
+ grid[y] = new Array(DASHBOARD_GRID_COLUMN_COUNT).fill(0);
+ }
+
+ currentPanelsArray.forEach(panel => {
+ for (let x = panel.gridData.x; x < panel.gridData.x + panel.gridData.w; x++) {
+ for (let y = panel.gridData.y; y < panel.gridData.y + panel.gridData.h; y++) {
+ const row = grid[y];
+ if (row === undefined) {
+ throw new Error(
+ `Attempted to access a row that doesn't exist at ${y} for panel ${JSON.stringify(
+ panel
+ )}`
+ );
+ }
+ grid[y][x] = 1;
+ }
+ }
+ });
+
+ for (let y = 0; y < maxY; y++) {
+ for (let x = 0; x < DASHBOARD_GRID_COLUMN_COUNT; x++) {
+ if (grid[y][x] === 1) {
+ // Space is filled
+ continue;
+ } else {
+ for (let h = y; h < Math.min(y + height, maxY); h++) {
+ for (let w = x; w < Math.min(x + width, DASHBOARD_GRID_COLUMN_COUNT); w++) {
+ const spaceIsEmpty = grid[h][w] === 0;
+ const fitsPanelWidth = w === x + width - 1;
+ // If the panel is taller than any other panel in the current grid, it can still fit in the space, hence
+ // we check the minimum of maxY and the panel height.
+ const fitsPanelHeight = h === Math.min(y + height - 1, maxY - 1);
+
+ if (spaceIsEmpty && fitsPanelWidth && fitsPanelHeight) {
+ // Found space
+ return { x, y, w: width, h: height };
+ } else if (grid[h][w] === 1) {
+ // x, y spot doesn't work, break.
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ return { x: 0, y: maxY, w: width, h: height };
+}
+
+interface IplacementDirection {
+ grid: Omit;
+ fits: boolean;
+}
+
+export function placePanelBeside({
+ width,
+ height,
+ currentPanels,
+ placeBesideId,
+}: IPanelPlacementBesideArgs): Omit {
+ // const clonedPanels = _.cloneDeep(currentPanels);
+ if (!placeBesideId) {
+ throw new Error('Place beside method called without placeBesideId');
+ }
+ const panelToPlaceBeside = currentPanels[placeBesideId];
+ if (!panelToPlaceBeside) {
+ throw new PanelNotFoundError();
+ }
+ const beside = panelToPlaceBeside.gridData;
+ const otherPanels: GridData[] = [];
+ _.forOwn(currentPanels, (panel: DashboardPanelState, key: string | undefined) => {
+ otherPanels.push(panel.gridData);
+ });
+
+ const possiblePlacementDirections: IplacementDirection[] = [
+ { grid: { x: beside.x + beside.w, y: beside.y, w: width, h: height }, fits: true }, // right
+ { grid: { x: beside.x - width, y: beside.y, w: width, h: height }, fits: true }, // left
+ { grid: { x: beside.x, y: beside.y + beside.h, w: width, h: height }, fits: true }, // bottom
+ ];
+
+ for (const direction of possiblePlacementDirections) {
+ if (
+ direction.grid.x >= 0 &&
+ direction.grid.x + direction.grid.w <= DASHBOARD_GRID_COLUMN_COUNT &&
+ direction.grid.y >= 0
+ ) {
+ const intersection = otherPanels.some((currentPanelGrid: GridData) => {
+ return (
+ direction.grid.x + direction.grid.w > currentPanelGrid.x &&
+ direction.grid.x < currentPanelGrid.x + currentPanelGrid.w &&
+ direction.grid.y < currentPanelGrid.y + currentPanelGrid.h &&
+ direction.grid.y + direction.grid.h > currentPanelGrid.y
+ );
+ });
+ if (!intersection) {
+ return direction.grid;
+ }
+ } else {
+ direction.fits = false;
+ }
+ }
+ // if we get here that means there is no blank space around the panel we are placing beside. This means it's time to mess up the dashboard's groove. Fun!
+ const [, , bottomPlacement] = possiblePlacementDirections;
+ for (const currentPanelGrid of otherPanels) {
+ if (bottomPlacement.grid.y <= currentPanelGrid.y) {
+ const movedPanel = _.cloneDeep(currentPanels[currentPanelGrid.i]);
+ movedPanel.gridData.y = movedPanel.gridData.y + bottomPlacement.grid.h;
+ currentPanels[currentPanelGrid.i] = movedPanel;
+ }
+ }
+ return bottomPlacement.grid;
+}
diff --git a/src/plugins/dashboard/public/application/embeddable/placeholder/index.ts b/src/plugins/dashboard/public/application/embeddable/placeholder/index.ts
new file mode 100644
index 0000000000000..7c65d50ce3fea
--- /dev/null
+++ b/src/plugins/dashboard/public/application/embeddable/placeholder/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './placeholder_embeddable';
+export * from './placeholder_embeddable_factory';
diff --git a/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx b/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx
new file mode 100644
index 0000000000000..1a5c3386bdeda
--- /dev/null
+++ b/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx
@@ -0,0 +1,52 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { EuiLoadingChart } from '@elastic/eui';
+import classNames from 'classnames';
+import { Embeddable, EmbeddableInput, IContainer } from '../../../embeddable_plugin';
+
+export const PLACEHOLDER_EMBEDDABLE = 'placeholder';
+
+export class PlaceholderEmbeddable extends Embeddable {
+ public readonly type = PLACEHOLDER_EMBEDDABLE;
+ private node?: HTMLElement;
+
+ constructor(initialInput: EmbeddableInput, parent?: IContainer) {
+ super(initialInput, {}, parent);
+ this.input = initialInput;
+ }
+ public render(node: HTMLElement) {
+ if (this.node) {
+ ReactDOM.unmountComponentAtNode(this.node);
+ }
+ this.node = node;
+
+ const classes = classNames('embPanel', 'embPanel-isLoading');
+ ReactDOM.render(
+
+
+
,
+ node
+ );
+ }
+
+ public reload() {}
+}
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/legacy.ts b/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable_factory.ts
similarity index 53%
rename from src/legacy/core_plugins/vis_type_timelion/public/legacy.ts
rename to src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable_factory.ts
index f8de9f94dcedf..30a93989649a7 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/legacy.ts
+++ b/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable_factory.ts
@@ -17,19 +17,29 @@
* under the License.
*/
-import { PluginInitializerContext } from 'kibana/public';
+import { i18n } from '@kbn/i18n';
-import { npSetup, npStart } from './legacy_imports';
-import { TimelionVisSetupDependencies } from './plugin';
-import { plugin } from '.';
+import {
+ EmbeddableFactoryDefinition,
+ EmbeddableInput,
+ IContainer,
+} from '../../../embeddable_plugin';
+import { PlaceholderEmbeddable, PLACEHOLDER_EMBEDDABLE } from './placeholder_embeddable';
-const setupPlugins: Readonly = {
- expressions: npSetup.plugins.expressions,
- data: npSetup.plugins.data,
- visualizations: npSetup.plugins.visualizations,
-};
+export class PlaceholderEmbeddableFactory implements EmbeddableFactoryDefinition {
+ public readonly type = PLACEHOLDER_EMBEDDABLE;
-const pluginInstance = plugin({} as PluginInitializerContext);
+ public async isEditable() {
+ return false;
+ }
-export const setup = pluginInstance.setup(npSetup.core, setupPlugins);
-export const start = pluginInstance.start(npStart.core, npStart.plugins);
+ public async create(initialInput: EmbeddableInput, parent?: IContainer) {
+ return new PlaceholderEmbeddable(initialInput, parent);
+ }
+
+ public getDisplayName() {
+ return i18n.translate('dashboard.placeholder.factory.displayName', {
+ defaultMessage: 'placeholder',
+ });
+ }
+}
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index 322d734d9f39f..203c784d9df4e 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -67,9 +67,12 @@ import {
ExpandPanelActionContext,
ReplacePanelAction,
ReplacePanelActionContext,
+ ClonePanelAction,
+ ClonePanelActionContext,
ACTION_EXPAND_PANEL,
ACTION_REPLACE_PANEL,
RenderDeps,
+ ACTION_CLONE_PANEL,
} from './application';
import {
DashboardAppLinkGeneratorState,
@@ -78,6 +81,7 @@ import {
} from './url_generator';
import { createSavedDashboardLoader } from './saved_dashboards';
import { DashboardConstants } from './dashboard_constants';
+import { PlaceholderEmbeddableFactory } from './application/embeddable/placeholder';
declare module '../../share/public' {
export interface UrlGeneratorStateMapping {
@@ -115,6 +119,7 @@ declare module '../../../plugins/ui_actions/public' {
export interface ActionContextMapping {
[ACTION_EXPAND_PANEL]: ExpandPanelActionContext;
[ACTION_REPLACE_PANEL]: ReplacePanelActionContext;
+ [ACTION_CLONE_PANEL]: ClonePanelActionContext;
}
}
@@ -173,6 +178,9 @@ export class DashboardPlugin
const factory = new DashboardContainerFactory(getStartServices);
embeddable.registerEmbeddableFactory(factory.type, factory);
+ const placeholderFactory = new PlaceholderEmbeddableFactory();
+ embeddable.registerEmbeddableFactory(placeholderFactory.type, placeholderFactory);
+
const { appMounted, appUnMounted, stop: stopUrlTracker } = createKbnUrlTracker({
baseUrl: core.http.basePath.prepend('/app/kibana'),
defaultSubUrl: `#${DashboardConstants.LANDING_PAGE_PATH}`,
@@ -297,6 +305,11 @@ export class DashboardPlugin
);
uiActions.registerAction(changeViewAction);
uiActions.attachAction(CONTEXT_MENU_TRIGGER, changeViewAction);
+
+ const clonePanelAction = new ClonePanelAction(core);
+ uiActions.registerAction(clonePanelAction);
+ uiActions.attachAction(CONTEXT_MENU_TRIGGER, clonePanelAction);
+
const savedDashboardLoader = createSavedDashboardLoader({
savedObjectsClient: core.savedObjects.client,
indexPatterns,
diff --git a/src/plugins/data/server/saved_objects/index_patterns.ts b/src/plugins/data/server/saved_objects/index_patterns.ts
index 9838071eee5a4..497dbb7d6f630 100644
--- a/src/plugins/data/server/saved_objects/index_patterns.ts
+++ b/src/plugins/data/server/saved_objects/index_patterns.ts
@@ -23,7 +23,7 @@ import { indexPatternSavedObjectTypeMigrations } from './index_pattern_migration
export const indexPatternSavedObjectType: SavedObjectsType = {
name: 'index-pattern',
hidden: false,
- namespaceAgnostic: false,
+ namespaceType: 'single',
management: {
icon: 'indexPatternApp',
defaultSearchField: 'title',
diff --git a/src/plugins/data/server/saved_objects/query.ts b/src/plugins/data/server/saved_objects/query.ts
index ff0a6cfde8113..015cc7c6cb134 100644
--- a/src/plugins/data/server/saved_objects/query.ts
+++ b/src/plugins/data/server/saved_objects/query.ts
@@ -22,7 +22,7 @@ import { SavedObjectsType } from 'kibana/server';
export const querySavedObjectType: SavedObjectsType = {
name: 'query',
hidden: false,
- namespaceAgnostic: false,
+ namespaceType: 'single',
management: {
icon: 'search',
defaultSearchField: 'title',
diff --git a/src/plugins/data/server/saved_objects/search.ts b/src/plugins/data/server/saved_objects/search.ts
index 8b30ff7d08201..54de35a90ae02 100644
--- a/src/plugins/data/server/saved_objects/search.ts
+++ b/src/plugins/data/server/saved_objects/search.ts
@@ -23,7 +23,7 @@ import { searchSavedObjectTypeMigrations } from './search_migrations';
export const searchSavedObjectType: SavedObjectsType = {
name: 'search',
hidden: false,
- namespaceAgnostic: false,
+ namespaceType: 'single',
management: {
icon: 'discoverApp',
defaultSearchField: 'title',
diff --git a/src/plugins/kibana_react/public/index.ts b/src/plugins/kibana_react/public/index.ts
index 9ad9f14ac5659..9bec91b859ab7 100644
--- a/src/plugins/kibana_react/public/index.ts
+++ b/src/plugins/kibana_react/public/index.ts
@@ -25,7 +25,7 @@ export * from './ui_settings';
export * from './field_icon';
export * from './table_list_view';
export * from './split_panel';
-export { ValidatedDualRange } from './validated_range';
+export { ValidatedDualRange, Value } from './validated_range';
export * from './notifications';
export { Markdown, MarkdownSimple } from './markdown';
export { reactToUiComponent, uiToReactComponent } from './adapters';
diff --git a/src/plugins/kibana_react/public/validated_range/index.ts b/src/plugins/kibana_react/public/validated_range/index.ts
index bc643373f5e60..7d720ec842a43 100644
--- a/src/plugins/kibana_react/public/validated_range/index.ts
+++ b/src/plugins/kibana_react/public/validated_range/index.ts
@@ -17,4 +17,4 @@
* under the License.
*/
-export { ValidatedDualRange } from './validated_dual_range';
+export { ValidatedDualRange, Value } from './validated_dual_range';
diff --git a/src/plugins/kibana_utils/public/core/create_start_service_getter.test.ts b/src/plugins/kibana_utils/public/core/create_start_service_getter.test.ts
new file mode 100644
index 0000000000000..9d9b21269e102
--- /dev/null
+++ b/src/plugins/kibana_utils/public/core/create_start_service_getter.test.ts
@@ -0,0 +1,78 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { StartServicesAccessor } from '../../../../core/public';
+import { createStartServicesGetter } from './create_start_service_getter';
+import { Defer } from '../../common/defer';
+
+describe('createStartServicesGetter', () => {
+ test('throws if services are accessed before accessor resolves', async () => {
+ const future = new Defer();
+ const accessor: StartServicesAccessor = async () => await future.promise;
+ const start = createStartServicesGetter(accessor);
+
+ await new Promise(r => setTimeout(r, 1));
+
+ expect(() => start()).toThrowErrorMatchingInlineSnapshot(
+ `"Trying to access start services before start."`
+ );
+ });
+
+ test('returns services after accessor resolves even if first time called before it resolved', async () => {
+ const future = new Defer();
+ const core = {};
+ const plugins = {};
+ const self = {};
+ const accessor: StartServicesAccessor = async () => await future.promise;
+ const start = createStartServicesGetter(accessor);
+
+ await new Promise(r => setTimeout(r, 1));
+
+ expect(() => start()).toThrow();
+
+ await new Promise(r => setTimeout(r, 1));
+ future.resolve([core, plugins, self]);
+ await future.promise;
+
+ expect(start()).toEqual({
+ core,
+ plugins,
+ self,
+ });
+ });
+
+ test('returns services if called after accessor resolves', async () => {
+ const future = new Defer();
+ const core = {};
+ const plugins = {};
+ const self = {};
+ const accessor: StartServicesAccessor = async () => await future.promise;
+ const start = createStartServicesGetter(accessor);
+
+ await new Promise(r => setTimeout(r, 1));
+ future.resolve([core, plugins, self]);
+ await future.promise;
+
+ expect(start()).toEqual({
+ core,
+ plugins,
+ self,
+ });
+ });
+});
diff --git a/src/plugins/kibana_utils/public/core/create_start_service_getter.ts b/src/plugins/kibana_utils/public/core/create_start_service_getter.ts
new file mode 100644
index 0000000000000..e507d1ae778e5
--- /dev/null
+++ b/src/plugins/kibana_utils/public/core/create_start_service_getter.ts
@@ -0,0 +1,56 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CoreStart, StartServicesAccessor } from '../../../../core/public';
+
+export interface StartServices {
+ plugins: Plugins;
+ self: OwnContract;
+ core: CoreStart;
+}
+
+export type StartServicesGetter = () => StartServices<
+ Plugins,
+ OwnContract
+>;
+
+export const createStartServicesGetter = (
+ accessor: StartServicesAccessor
+): StartServicesGetter => {
+ let services: StartServices | undefined;
+
+ accessor().then(
+ ([core, plugins, self]) => {
+ services = {
+ core,
+ plugins,
+ self,
+ };
+ },
+ error => {
+ // eslint-disable-next-line no-console
+ console.error('Could not access start services.', error);
+ }
+ );
+
+ return () => {
+ if (!services) throw new Error('Trying to access start services before start.');
+ return services;
+ };
+};
diff --git a/src/plugins/kibana_utils/public/core/index.ts b/src/plugins/kibana_utils/public/core/index.ts
index 3f08d591300a2..8bbb2129071f5 100644
--- a/src/plugins/kibana_utils/public/core/index.ts
+++ b/src/plugins/kibana_utils/public/core/index.ts
@@ -18,3 +18,4 @@
*/
export * from './create_kibana_utils_core';
+export * from './create_start_service_getter';
diff --git a/src/plugins/saved_objects_management/server/services/management.test.ts b/src/plugins/saved_objects_management/server/services/management.test.ts
index 6b95048749fae..3625a3f913444 100644
--- a/src/plugins/saved_objects_management/server/services/management.test.ts
+++ b/src/plugins/saved_objects_management/server/services/management.test.ts
@@ -28,7 +28,7 @@ describe('SavedObjectsManagement', () => {
registry.registerType({
name: 'unknown',
hidden: false,
- namespaceAgnostic: false,
+ namespaceType: 'single',
mappings: { properties: {} },
migrations: {},
...type,
diff --git a/src/plugins/telemetry/server/collectors/application_usage/saved_objects_types.ts b/src/plugins/telemetry/server/collectors/application_usage/saved_objects_types.ts
index 9f997ab7b5df3..a0de79da565e6 100644
--- a/src/plugins/telemetry/server/collectors/application_usage/saved_objects_types.ts
+++ b/src/plugins/telemetry/server/collectors/application_usage/saved_objects_types.ts
@@ -33,7 +33,7 @@ export function registerMappings(registerType: SavedObjectsServiceSetup['registe
registerType({
name: 'application_usage_totals',
hidden: false,
- namespaceAgnostic: true,
+ namespaceType: 'agnostic',
mappings: {
properties: {
appId: { type: 'keyword' },
@@ -46,7 +46,7 @@ export function registerMappings(registerType: SavedObjectsServiceSetup['registe
registerType({
name: 'application_usage_transactional',
hidden: false,
- namespaceAgnostic: true,
+ namespaceType: 'agnostic',
mappings: {
properties: {
timestamp: { type: 'date' },
diff --git a/src/plugins/telemetry/server/collectors/ui_metric/telemetry_ui_metric_collector.ts b/src/plugins/telemetry/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
index 3f6e1836cac7d..603742f612a6b 100644
--- a/src/plugins/telemetry/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
+++ b/src/plugins/telemetry/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
@@ -38,7 +38,7 @@ export function registerUiMetricUsageCollector(
registerType({
name: 'ui-metric',
hidden: false,
- namespaceAgnostic: true,
+ namespaceType: 'agnostic',
mappings: {
properties: {
count: {
diff --git a/src/plugins/telemetry/server/plugin.ts b/src/plugins/telemetry/server/plugin.ts
index 1df6a665e4d76..d1530c272027a 100644
--- a/src/plugins/telemetry/server/plugin.ts
+++ b/src/plugins/telemetry/server/plugin.ts
@@ -125,7 +125,7 @@ export class TelemetryPlugin implements Plugin {
registerType({
name: 'telemetry',
hidden: false,
- namespaceAgnostic: true,
+ namespaceType: 'agnostic',
mappings: {
properties: {
enabled: {
diff --git a/src/plugins/timelion/kibana.json b/src/plugins/timelion/kibana.json
deleted file mode 100644
index dddfd6c67e655..0000000000000
--- a/src/plugins/timelion/kibana.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "id": "timelion",
- "version": "8.0.0",
- "kibanaVersion": "kibana",
- "configPath": ["timelion"],
- "server": true,
- "ui": true
-}
diff --git a/src/plugins/vis_default_editor/public/default_editor.tsx b/src/plugins/vis_default_editor/public/default_editor.tsx
index f1963b94dcf95..1c2ddbc314f99 100644
--- a/src/plugins/vis_default_editor/public/default_editor.tsx
+++ b/src/plugins/vis_default_editor/public/default_editor.tsx
@@ -19,7 +19,7 @@
import React, { useEffect, useRef, useState, useCallback } from 'react';
-import { EditorRenderProps } from 'src/legacy/core_plugins/kibana/public/visualize/np_ready/types';
+import { EditorRenderProps } from 'src/plugins/visualize/public';
import { PanelsContainer, Panel } from '../../kibana_react/public';
import './vis_type_agg_filter';
diff --git a/src/plugins/vis_default_editor/public/default_editor_controller.tsx b/src/plugins/vis_default_editor/public/default_editor_controller.tsx
index 798da09f8e30b..014c69f50d558 100644
--- a/src/plugins/vis_default_editor/public/default_editor_controller.tsx
+++ b/src/plugins/vis_default_editor/public/default_editor_controller.tsx
@@ -22,7 +22,7 @@ import { render, unmountComponentAtNode } from 'react-dom';
import { i18n } from '@kbn/i18n';
import { EventEmitter } from 'events';
-import { EditorRenderProps } from 'src/legacy/core_plugins/kibana/public/visualize/np_ready/types';
+import { EditorRenderProps } from 'src/plugins/visualize/public';
import { Vis, VisualizeEmbeddableContract } from 'src/plugins/visualizations/public';
import { Storage } from '../../kibana_utils/public';
import { KibanaContextProvider } from '../../kibana_react/public';
diff --git a/src/plugins/vis_type_markdown/config.ts b/src/plugins/vis_type_markdown/config.ts
new file mode 100644
index 0000000000000..6749bd83de39f
--- /dev/null
+++ b/src/plugins/vis_type_markdown/config.ts
@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+
+export const configSchema = schema.object({
+ enabled: schema.boolean({ defaultValue: true }),
+});
+
+export type ConfigSchema = TypeOf;
diff --git a/src/plugins/vis_type_markdown/kibana.json b/src/plugins/vis_type_markdown/kibana.json
new file mode 100644
index 0000000000000..d52e22118ccf0
--- /dev/null
+++ b/src/plugins/vis_type_markdown/kibana.json
@@ -0,0 +1,7 @@
+{
+ "id": "visTypeMarkdown",
+ "version": "kibana",
+ "ui": true,
+ "server": true,
+ "requiredPlugins": ["expressions", "visualizations"]
+}
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/__snapshots__/markdown_fn.test.ts.snap b/src/plugins/vis_type_markdown/public/__snapshots__/markdown_fn.test.ts.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_markdown/public/__snapshots__/markdown_fn.test.ts.snap
rename to src/plugins/vis_type_markdown/public/__snapshots__/markdown_fn.test.ts.snap
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/_markdown_vis.scss b/src/plugins/vis_type_markdown/public/_markdown_vis.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_markdown/public/_markdown_vis.scss
rename to src/plugins/vis_type_markdown/public/_markdown_vis.scss
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/index.scss b/src/plugins/vis_type_markdown/public/index.scss
similarity index 76%
rename from src/legacy/core_plugins/vis_type_markdown/public/index.scss
rename to src/plugins/vis_type_markdown/public/index.scss
index ebae2d1936a9e..ddb7fe3a6b0d9 100644
--- a/src/legacy/core_plugins/vis_type_markdown/public/index.scss
+++ b/src/plugins/vis_type_markdown/public/index.scss
@@ -1,5 +1,3 @@
-@import 'src/legacy/ui/public/styles/styling_constants';
-
// Prefix all styles with "mkd" to avoid conflicts.
// Examples
// mkdChart
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/index.ts b/src/plugins/vis_type_markdown/public/index.ts
similarity index 93%
rename from src/legacy/core_plugins/vis_type_markdown/public/index.ts
rename to src/plugins/vis_type_markdown/public/index.ts
index 22dd61b6bda9c..bc3b6ff7bf105 100644
--- a/src/legacy/core_plugins/vis_type_markdown/public/index.ts
+++ b/src/plugins/vis_type_markdown/public/index.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { PluginInitializerContext } from '../../../../core/public';
+import { PluginInitializerContext } from '../../../core/public';
import { MarkdownPlugin as Plugin } from './plugin';
export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/markdown_fn.test.ts b/src/plugins/vis_type_markdown/public/markdown_fn.test.ts
similarity index 89%
rename from src/legacy/core_plugins/vis_type_markdown/public/markdown_fn.test.ts
rename to src/plugins/vis_type_markdown/public/markdown_fn.test.ts
index 5f41840bac99b..d6085804e74ab 100644
--- a/src/legacy/core_plugins/vis_type_markdown/public/markdown_fn.test.ts
+++ b/src/plugins/vis_type_markdown/public/markdown_fn.test.ts
@@ -17,8 +17,7 @@
* under the License.
*/
-// eslint-disable-next-line
-import { functionWrapper } from '../../../../plugins/expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
import { createMarkdownVisFn } from './markdown_fn';
describe('interpreter/functions#markdown', () => {
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/markdown_fn.ts b/src/plugins/vis_type_markdown/public/markdown_fn.ts
similarity index 95%
rename from src/legacy/core_plugins/vis_type_markdown/public/markdown_fn.ts
rename to src/plugins/vis_type_markdown/public/markdown_fn.ts
index bbf2b7844c73f..9f0809109e465 100644
--- a/src/legacy/core_plugins/vis_type_markdown/public/markdown_fn.ts
+++ b/src/plugins/vis_type_markdown/public/markdown_fn.ts
@@ -18,7 +18,7 @@
*/
import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, Render } from '../../../../plugins/expressions/public';
+import { ExpressionFunctionDefinition, Render } from '../../expressions/public';
import { Arguments, MarkdownVisParams } from './types';
interface RenderValue {
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/markdown_options.tsx b/src/plugins/vis_type_markdown/public/markdown_options.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_markdown/public/markdown_options.tsx
rename to src/plugins/vis_type_markdown/public/markdown_options.tsx
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis.ts b/src/plugins/vis_type_markdown/public/markdown_vis.ts
similarity index 96%
rename from src/legacy/core_plugins/vis_type_markdown/public/markdown_vis.ts
rename to src/plugins/vis_type_markdown/public/markdown_vis.ts
index 57ea6d9c9bb3d..b84d9638eb973 100644
--- a/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis.ts
+++ b/src/plugins/vis_type_markdown/public/markdown_vis.ts
@@ -22,7 +22,7 @@ import { i18n } from '@kbn/i18n';
import { MarkdownVisWrapper } from './markdown_vis_controller';
import { MarkdownOptions } from './markdown_options';
import { SettingsOptions } from './settings_options';
-import { DefaultEditorSize } from '../../../../plugins/vis_default_editor/public';
+import { DefaultEditorSize } from '../../vis_default_editor/public';
export const markdownVisDefinition = {
name: 'markdown',
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.test.tsx b/src/plugins/vis_type_markdown/public/markdown_vis_controller.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.test.tsx
rename to src/plugins/vis_type_markdown/public/markdown_vis_controller.test.tsx
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.tsx b/src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx
similarity index 97%
rename from src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.tsx
rename to src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx
index 3260e9f7d8091..4e77bb196b713 100644
--- a/src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.tsx
+++ b/src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx
@@ -18,7 +18,7 @@
*/
import React from 'react';
-import { Markdown } from '../../../../plugins/kibana_react/public';
+import { Markdown } from '../../kibana_react/public';
import { MarkdownVisParams } from './types';
interface MarkdownVisComponentProps extends MarkdownVisParams {
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/plugin.ts b/src/plugins/vis_type_markdown/public/plugin.ts
similarity index 80%
rename from src/legacy/core_plugins/vis_type_markdown/public/plugin.ts
rename to src/plugins/vis_type_markdown/public/plugin.ts
index 0445d270c9330..9365017a31adc 100644
--- a/src/legacy/core_plugins/vis_type_markdown/public/plugin.ts
+++ b/src/plugins/vis_type_markdown/public/plugin.ts
@@ -17,12 +17,15 @@
* under the License.
*/
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
-import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
+import { VisualizationsSetup } from '../../visualizations/public';
import { markdownVisDefinition } from './markdown_vis';
import { createMarkdownVisFn } from './markdown_fn';
+import { ConfigSchema } from '../config';
+
+import './index.scss';
/** @internal */
export interface MarkdownPluginSetupDependencies {
@@ -32,9 +35,9 @@ export interface MarkdownPluginSetupDependencies {
/** @internal */
export class MarkdownPlugin implements Plugin {
- initializerContext: PluginInitializerContext;
+ initializerContext: PluginInitializerContext;
- constructor(initializerContext: PluginInitializerContext) {
+ constructor(initializerContext: PluginInitializerContext) {
this.initializerContext = initializerContext;
}
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx b/src/plugins/vis_type_markdown/public/settings_options.tsx
similarity index 95%
rename from src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx
rename to src/plugins/vis_type_markdown/public/settings_options.tsx
index 16b2749c34e10..6f6a80564ce07 100644
--- a/src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx
+++ b/src/plugins/vis_type_markdown/public/settings_options.tsx
@@ -22,7 +22,7 @@ import { EuiPanel } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
-import { RangeOption, SwitchOption } from '../../../../plugins/charts/public';
+import { RangeOption, SwitchOption } from '../../charts/public';
import { MarkdownVisParams } from './types';
function SettingsOptions({ stateParams, setValue }: VisOptionsProps) {
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/types.ts b/src/plugins/vis_type_markdown/public/types.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_markdown/public/types.ts
rename to src/plugins/vis_type_markdown/public/types.ts
diff --git a/src/plugins/timelion/public/index.ts b/src/plugins/vis_type_markdown/server/index.ts
similarity index 69%
rename from src/plugins/timelion/public/index.ts
rename to src/plugins/vis_type_markdown/server/index.ts
index b05c4f8a30b22..73e1712353b1a 100644
--- a/src/plugins/timelion/public/index.ts
+++ b/src/plugins/vis_type_markdown/server/index.ts
@@ -17,14 +17,18 @@
* under the License.
*/
-import { CoreStart, PluginInitializerContext } from 'kibana/public';
-import { ConfigSchema } from '../config';
+import { PluginConfigDescriptor } from 'kibana/server';
-export const plugin = (initializerContext: PluginInitializerContext) => ({
+import { configSchema, ConfigSchema } from '../config';
+
+export const config: PluginConfigDescriptor = {
+ schema: configSchema,
+ deprecations: ({ renameFromRoot }) => [
+ renameFromRoot('markdown_vis.enabled', 'vis_type_markdown.enabled'),
+ ],
+};
+
+export const plugin = () => ({
setup() {},
- start(core: CoreStart) {
- if (initializerContext.config.get().ui.enabled === false) {
- core.chrome.navLinks.update('timelion', { hidden: true });
- }
- },
+ start() {},
});
diff --git a/src/legacy/core_plugins/vis_type_timelion/README.md b/src/plugins/vis_type_timelion/README.md
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/README.md
rename to src/plugins/vis_type_timelion/README.md
diff --git a/src/plugins/timelion/common/chain.peg b/src/plugins/vis_type_timelion/common/chain.peg
similarity index 100%
rename from src/plugins/timelion/common/chain.peg
rename to src/plugins/vis_type_timelion/common/chain.peg
diff --git a/src/plugins/timelion/common/lib/calculate_interval.test.ts b/src/plugins/vis_type_timelion/common/lib/calculate_interval.test.ts
similarity index 100%
rename from src/plugins/timelion/common/lib/calculate_interval.test.ts
rename to src/plugins/vis_type_timelion/common/lib/calculate_interval.test.ts
diff --git a/src/plugins/timelion/common/lib/calculate_interval.ts b/src/plugins/vis_type_timelion/common/lib/calculate_interval.ts
similarity index 100%
rename from src/plugins/timelion/common/lib/calculate_interval.ts
rename to src/plugins/vis_type_timelion/common/lib/calculate_interval.ts
diff --git a/src/plugins/timelion/common/lib/index.ts b/src/plugins/vis_type_timelion/common/lib/index.ts
similarity index 100%
rename from src/plugins/timelion/common/lib/index.ts
rename to src/plugins/vis_type_timelion/common/lib/index.ts
diff --git a/src/plugins/timelion/common/lib/to_milliseconds.ts b/src/plugins/vis_type_timelion/common/lib/to_milliseconds.ts
similarity index 100%
rename from src/plugins/timelion/common/lib/to_milliseconds.ts
rename to src/plugins/vis_type_timelion/common/lib/to_milliseconds.ts
diff --git a/src/plugins/timelion/common/types.ts b/src/plugins/vis_type_timelion/common/types.ts
similarity index 100%
rename from src/plugins/timelion/common/types.ts
rename to src/plugins/vis_type_timelion/common/types.ts
diff --git a/src/plugins/timelion/config.ts b/src/plugins/vis_type_timelion/config.ts
similarity index 100%
rename from src/plugins/timelion/config.ts
rename to src/plugins/vis_type_timelion/config.ts
diff --git a/src/plugins/vis_type_timelion/kibana.json b/src/plugins/vis_type_timelion/kibana.json
new file mode 100644
index 0000000000000..85c282c51a2e7
--- /dev/null
+++ b/src/plugins/vis_type_timelion/kibana.json
@@ -0,0 +1,8 @@
+{
+ "id": "visTypeTimelion",
+ "version": "8.0.0",
+ "kibanaVersion": "kibana",
+ "server": true,
+ "ui": true,
+ "requiredPlugins": ["visualizations", "data", "expressions"]
+}
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/_generated_/chain.js b/src/plugins/vis_type_timelion/public/_generated_/chain.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/_generated_/chain.js
rename to src/plugins/vis_type_timelion/public/_generated_/chain.js
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/_timelion_editor.scss b/src/plugins/vis_type_timelion/public/_timelion_editor.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/_timelion_editor.scss
rename to src/plugins/vis_type_timelion/public/_timelion_editor.scss
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/_timelion_vis.scss b/src/plugins/vis_type_timelion/public/_timelion_vis.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/_timelion_vis.scss
rename to src/plugins/vis_type_timelion/public/_timelion_vis.scss
diff --git a/src/plugins/vis_type_timelion/public/components/_index.scss b/src/plugins/vis_type_timelion/public/components/_index.scss
new file mode 100644
index 0000000000000..707c9dafebe2b
--- /dev/null
+++ b/src/plugins/vis_type_timelion/public/components/_index.scss
@@ -0,0 +1,2 @@
+@import 'panel';
+@import 'timelion_expression_input';
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/components/_panel.scss b/src/plugins/vis_type_timelion/public/components/_panel.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/components/_panel.scss
rename to src/plugins/vis_type_timelion/public/components/_panel.scss
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/components/_timelion_expression_input.scss b/src/plugins/vis_type_timelion/public/components/_timelion_expression_input.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/components/_timelion_expression_input.scss
rename to src/plugins/vis_type_timelion/public/components/_timelion_expression_input.scss
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/components/chart.tsx b/src/plugins/vis_type_timelion/public/components/chart.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/components/chart.tsx
rename to src/plugins/vis_type_timelion/public/components/chart.tsx
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/components/index.ts b/src/plugins/vis_type_timelion/public/components/index.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/components/index.ts
rename to src/plugins/vis_type_timelion/public/components/index.ts
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/components/panel.tsx b/src/plugins/vis_type_timelion/public/components/panel.tsx
similarity index 98%
rename from src/legacy/core_plugins/vis_type_timelion/public/components/panel.tsx
rename to src/plugins/vis_type_timelion/public/components/panel.tsx
index 3b42fa7dfcbb8..8f796526e8520 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/components/panel.tsx
+++ b/src/plugins/vis_type_timelion/public/components/panel.tsx
@@ -22,9 +22,9 @@ import $ from 'jquery';
import moment from 'moment-timezone';
import { debounce, compact, get, each, cloneDeep, last, map } from 'lodash';
-import { useKibana } from '../../../../../plugins/kibana_react/public';
+import { useKibana } from '../../../kibana_react/public';
import '../flot';
-import { DEFAULT_TIME_FORMAT } from '../../../../../plugins/timelion/common/lib';
+import { DEFAULT_TIME_FORMAT } from '../../common/lib';
import {
buildSeriesData,
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_expression_input.tsx b/src/plugins/vis_type_timelion/public/components/timelion_expression_input.tsx
similarity index 96%
rename from src/legacy/core_plugins/vis_type_timelion/public/components/timelion_expression_input.tsx
rename to src/plugins/vis_type_timelion/public/components/timelion_expression_input.tsx
index c317451b8201e..999409ef35063 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_expression_input.tsx
+++ b/src/plugins/vis_type_timelion/public/components/timelion_expression_input.tsx
@@ -22,13 +22,10 @@ import { EuiFormLabel } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { monaco } from '@kbn/ui-shared-deps/monaco';
-import { CodeEditor, useKibana } from '../../../../../plugins/kibana_react/public';
+import { CodeEditor, useKibana } from '../../../kibana_react/public';
import { suggest, getSuggestion } from './timelion_expression_input_helpers';
import { getArgValueSuggestions } from '../helpers/arg_value_suggestions';
-import {
- ITimelionFunction,
- TimelionFunctionArgs,
-} from '../../../../../plugins/timelion/common/types';
+import { ITimelionFunction, TimelionFunctionArgs } from '../../common/types';
const LANGUAGE_ID = 'timelion_expression';
monaco.languages.register({ id: LANGUAGE_ID });
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.test.ts b/src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.test.ts
similarity index 99%
rename from src/legacy/core_plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.test.ts
rename to src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.test.ts
index 2f99256e2a192..2ff6809d1c83d 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.test.ts
+++ b/src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.test.ts
@@ -22,7 +22,7 @@ import { getArgValueSuggestions } from '../helpers/arg_value_suggestions';
import { setIndexPatterns, setSavedObjectsClient } from '../helpers/plugin_services';
import { IndexPatternsContract } from 'src/plugins/data/public';
import { SavedObjectsClient } from 'kibana/public';
-import { ITimelionFunction } from '../../../../../plugins/timelion/common/types';
+import { ITimelionFunction } from '../../common/types';
describe('Timelion expression suggestions', () => {
setIndexPatterns({} as IndexPatternsContract);
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.ts b/src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.ts
similarity index 98%
rename from src/legacy/core_plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.ts
rename to src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.ts
index 6f23c864419eb..04cb54306c90e 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.ts
+++ b/src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.ts
@@ -27,10 +27,7 @@ import { Parser } from 'pegjs';
import { parse } from '../_generated_/chain';
import { ArgValueSuggestions, FunctionArg, Location } from '../helpers/arg_value_suggestions';
-import {
- ITimelionFunction,
- TimelionFunctionArgs,
-} from '../../../../../plugins/timelion/common/types';
+import { ITimelionFunction, TimelionFunctionArgs } from '../../common/types';
export enum SUGGESTION_TYPE {
ARGUMENTS = 'arguments',
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_interval.tsx b/src/plugins/vis_type_timelion/public/components/timelion_interval.tsx
similarity index 96%
rename from src/legacy/core_plugins/vis_type_timelion/public/components/timelion_interval.tsx
rename to src/plugins/vis_type_timelion/public/components/timelion_interval.tsx
index 8a8e1b22fb78d..985ecaeaf3e5a 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_interval.tsx
+++ b/src/plugins/vis_type_timelion/public/components/timelion_interval.tsx
@@ -21,9 +21,9 @@ import React, { useMemo, useCallback } from 'react';
import { EuiFormRow, EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-import { search } from '../../../../../plugins/data/public';
+import { search } from '../../../data/public';
const { isValidEsInterval } = search.aggs;
-import { useValidation } from '../../../../../plugins/vis_default_editor/public';
+import { useValidation } from '../../../vis_default_editor/public';
const intervalOptions = [
{
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_vis.tsx b/src/plugins/vis_type_timelion/public/components/timelion_vis.tsx
similarity index 95%
rename from src/legacy/core_plugins/vis_type_timelion/public/components/timelion_vis.tsx
rename to src/plugins/vis_type_timelion/public/components/timelion_vis.tsx
index 0fad0a164bf0b..4bb07fe74ee82 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/components/timelion_vis.tsx
+++ b/src/plugins/vis_type_timelion/public/components/timelion_vis.tsx
@@ -23,7 +23,7 @@ import { IUiSettingsClient } from 'kibana/public';
import { ChartComponent } from './chart';
import { VisParams } from '../timelion_vis_fn';
import { TimelionSuccessResponse } from '../helpers/timelion_request_handler';
-import { ExprVis } from '../../../../../plugins/visualizations/public';
+import { ExprVis } from '../../../visualizations/public';
export interface TimelionVisComponentProp {
config: IUiSettingsClient;
diff --git a/src/plugins/vis_type_timelion/public/flot.js b/src/plugins/vis_type_timelion/public/flot.js
new file mode 100644
index 0000000000000..1ccb40c93a3d6
--- /dev/null
+++ b/src/plugins/vis_type_timelion/public/flot.js
@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import './webpackShims/jquery.flot';
+import './webpackShims/jquery.flot.time';
+import './webpackShims/jquery.flot.symbol';
+import './webpackShims/jquery.flot.crosshair';
+import './webpackShims/jquery.flot.selection';
+import './webpackShims/jquery.flot.stack';
+import './webpackShims/jquery.flot.axislabels';
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts b/src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts
similarity index 97%
rename from src/legacy/core_plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts
rename to src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts
index ea9532964d6fe..76c25b9b9e8de 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts
+++ b/src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts
@@ -19,11 +19,8 @@
import { get } from 'lodash';
import { getIndexPatterns, getSavedObjectsClient } from './plugin_services';
-import { TimelionFunctionArgs } from '../../../../../plugins/timelion/common/types';
-import {
- indexPatterns as indexPatternsUtils,
- IndexPatternAttributes,
-} from '../../../../../plugins/data/public';
+import { TimelionFunctionArgs } from '../../common/types';
+import { indexPatterns as indexPatternsUtils, IndexPatternAttributes } from '../../../data/public';
export interface Location {
min: number;
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/helpers/get_timezone.ts b/src/plugins/vis_type_timelion/public/helpers/get_timezone.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/helpers/get_timezone.ts
rename to src/plugins/vis_type_timelion/public/helpers/get_timezone.ts
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/helpers/panel_utils.ts b/src/plugins/vis_type_timelion/public/helpers/panel_utils.ts
similarity index 98%
rename from src/legacy/core_plugins/vis_type_timelion/public/helpers/panel_utils.ts
rename to src/plugins/vis_type_timelion/public/helpers/panel_utils.ts
index f932e5ee4b2f4..db29d9112be8e 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/helpers/panel_utils.ts
+++ b/src/plugins/vis_type_timelion/public/helpers/panel_utils.ts
@@ -23,7 +23,7 @@ import moment, { Moment } from 'moment-timezone';
import { TimefilterContract } from 'src/plugins/data/public';
import { IUiSettingsClient } from 'kibana/public';
-import { calculateInterval } from '../../../../../plugins/timelion/common/lib';
+import { calculateInterval } from '../../common/lib';
import { xaxisFormatterProvider } from './xaxis_formatter';
import { Series } from './timelion_request_handler';
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/helpers/plugin_services.ts b/src/plugins/vis_type_timelion/public/helpers/plugin_services.ts
similarity index 93%
rename from src/legacy/core_plugins/vis_type_timelion/public/helpers/plugin_services.ts
rename to src/plugins/vis_type_timelion/public/helpers/plugin_services.ts
index 5ba4ee5e47983..b055626934eea 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/helpers/plugin_services.ts
+++ b/src/plugins/vis_type_timelion/public/helpers/plugin_services.ts
@@ -19,7 +19,7 @@
import { IndexPatternsContract } from 'src/plugins/data/public';
import { SavedObjectsClientContract } from 'kibana/public';
-import { createGetterSetter } from '../../../../../plugins/kibana_utils/public';
+import { createGetterSetter } from '../../../kibana_utils/public';
export const [getIndexPatterns, setIndexPatterns] = createGetterSetter(
'IndexPatterns'
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/helpers/tick_formatters.test.ts b/src/plugins/vis_type_timelion/public/helpers/tick_formatters.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/helpers/tick_formatters.test.ts
rename to src/plugins/vis_type_timelion/public/helpers/tick_formatters.test.ts
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/helpers/tick_formatters.ts b/src/plugins/vis_type_timelion/public/helpers/tick_formatters.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/helpers/tick_formatters.ts
rename to src/plugins/vis_type_timelion/public/helpers/tick_formatters.ts
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/helpers/tick_generator.test.ts b/src/plugins/vis_type_timelion/public/helpers/tick_generator.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/helpers/tick_generator.test.ts
rename to src/plugins/vis_type_timelion/public/helpers/tick_generator.test.ts
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/helpers/tick_generator.ts b/src/plugins/vis_type_timelion/public/helpers/tick_generator.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/helpers/tick_generator.ts
rename to src/plugins/vis_type_timelion/public/helpers/tick_generator.ts
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts b/src/plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts
similarity index 95%
rename from src/legacy/core_plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts
rename to src/plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts
index 61e31420f73ba..a654f7935af5f 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts
+++ b/src/plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts
@@ -19,8 +19,8 @@
import { i18n } from '@kbn/i18n';
import { KIBANA_CONTEXT_NAME } from 'src/plugins/expressions/public';
-import { VisParams } from '../../../../../plugins/visualizations/public';
-import { TimeRange, Filter, esQuery, Query } from '../../../../../plugins/data/public';
+import { VisParams } from '../../../visualizations/public';
+import { TimeRange, Filter, esQuery, Query } from '../../../data/public';
import { TimelionVisDependencies } from '../plugin';
import { getTimezone } from './get_timezone';
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/helpers/xaxis_formatter.ts b/src/plugins/vis_type_timelion/public/helpers/xaxis_formatter.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/helpers/xaxis_formatter.ts
rename to src/plugins/vis_type_timelion/public/helpers/xaxis_formatter.ts
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/index.scss b/src/plugins/vis_type_timelion/public/index.scss
similarity index 59%
rename from src/legacy/core_plugins/vis_type_timelion/public/index.scss
rename to src/plugins/vis_type_timelion/public/index.scss
index 313f14a8acf69..00e9a88520961 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/index.scss
+++ b/src/plugins/vis_type_timelion/public/index.scss
@@ -1,5 +1,3 @@
-@import 'src/legacy/ui/public/styles/styling_constants';
-
@import './timelion_vis';
@import './timelion_editor';
@import './components/index';
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/index.ts b/src/plugins/vis_type_timelion/public/index.ts
similarity index 90%
rename from src/legacy/core_plugins/vis_type_timelion/public/index.ts
rename to src/plugins/vis_type_timelion/public/index.ts
index 6292e2ad3eb08..0aa5f3a810033 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/index.ts
+++ b/src/plugins/vis_type_timelion/public/index.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { PluginInitializerContext } from '../../../../core/public';
+import { PluginInitializerContext } from 'kibana/public';
import { TimelionVisPlugin as Plugin } from './plugin';
export function plugin(initializerContext: PluginInitializerContext) {
@@ -25,3 +25,5 @@ export function plugin(initializerContext: PluginInitializerContext) {
}
export { getTimezone } from './helpers/get_timezone';
+
+export { VisTypeTimelionPluginStart } from './plugin';
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/plugin.ts b/src/plugins/vis_type_timelion/public/plugin.ts
similarity index 67%
rename from src/legacy/core_plugins/vis_type_timelion/public/plugin.ts
rename to src/plugins/vis_type_timelion/public/plugin.ts
index b5aa64db19aa4..060fec04deb3f 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/plugin.ts
+++ b/src/plugins/vis_type_timelion/public/plugin.ts
@@ -26,16 +26,21 @@ import {
HttpSetup,
} from 'kibana/public';
import { Plugin as ExpressionsPlugin } from 'src/plugins/expressions/public';
-import { DataPublicPluginSetup, TimefilterContract } from 'src/plugins/data/public';
+import {
+ DataPublicPluginSetup,
+ DataPublicPluginStart,
+ TimefilterContract,
+} from 'src/plugins/data/public';
-import { PluginsStart } from './legacy_imports';
-import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
+import { VisualizationsSetup } from '../../visualizations/public';
import { getTimelionVisualizationConfig } from './timelion_vis_fn';
import { getTimelionVisDefinition } from './timelion_vis_type';
import { setIndexPatterns, setSavedObjectsClient } from './helpers/plugin_services';
+import { ConfigSchema } from '../config';
-type TimelionVisCoreSetup = CoreSetup;
+import './index.scss';
+import { getArgValueSuggestions } from './helpers/arg_value_suggestions';
/** @internal */
export interface TimelionVisDependencies extends Partial {
@@ -52,11 +57,28 @@ export interface TimelionVisSetupDependencies {
}
/** @internal */
-export class TimelionVisPlugin implements Plugin {
- constructor(public initializerContext: PluginInitializerContext) {}
+export interface TimelionVisStartDependencies {
+ data: DataPublicPluginStart;
+}
+
+/** @public */
+export interface VisTypeTimelionPluginStart {
+ getArgValueSuggestions: typeof getArgValueSuggestions;
+}
+
+/** @internal */
+export class TimelionVisPlugin
+ implements
+ Plugin<
+ void,
+ VisTypeTimelionPluginStart,
+ TimelionVisSetupDependencies,
+ TimelionVisStartDependencies
+ > {
+ constructor(public initializerContext: PluginInitializerContext) {}
- public async setup(
- core: TimelionVisCoreSetup,
+ public setup(
+ core: CoreSetup,
{ expressions, visualizations, data }: TimelionVisSetupDependencies
) {
const dependencies: TimelionVisDependencies = {
@@ -69,8 +91,15 @@ export class TimelionVisPlugin implements Plugin {
visualizations.createReactVisualization(getTimelionVisDefinition(dependencies));
}
- public start(core: CoreStart, plugins: PluginsStart) {
+ public start(core: CoreStart, plugins: TimelionVisStartDependencies) {
setIndexPatterns(plugins.data.indexPatterns);
setSavedObjectsClient(core.savedObjects.client);
+ if (this.initializerContext.config.get().ui.enabled === false) {
+ core.chrome.navLinks.update('timelion', { hidden: true });
+ }
+
+ return {
+ getArgValueSuggestions,
+ };
}
}
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/timelion_options.tsx b/src/plugins/vis_type_timelion/public/timelion_options.tsx
similarity index 95%
rename from src/legacy/core_plugins/vis_type_timelion/public/timelion_options.tsx
rename to src/plugins/vis_type_timelion/public/timelion_options.tsx
index afffcf7ccaf7a..dfe017d3a273f 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/timelion_options.tsx
+++ b/src/plugins/vis_type_timelion/public/timelion_options.tsx
@@ -24,7 +24,9 @@ import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
import { VisParams } from './timelion_vis_fn';
import { TimelionInterval, TimelionExpressionInput } from './components';
-function TimelionOptions({ stateParams, setValue, setValidity }: VisOptionsProps) {
+export type TimelionOptionsProps = VisOptionsProps;
+
+function TimelionOptions({ stateParams, setValue, setValidity }: TimelionOptionsProps) {
const setInterval = useCallback((value: VisParams['interval']) => setValue('interval', value), [
setValue,
]);
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/timelion_vis_fn.ts b/src/plugins/vis_type_timelion/public/timelion_vis_fn.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/timelion_vis_fn.ts
rename to src/plugins/vis_type_timelion/public/timelion_vis_fn.ts
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/timelion_vis_type.tsx b/src/plugins/vis_type_timelion/public/timelion_vis_type.tsx
similarity index 84%
rename from src/legacy/core_plugins/vis_type_timelion/public/timelion_vis_type.tsx
rename to src/plugins/vis_type_timelion/public/timelion_vis_type.tsx
index 5be77b3e51a6a..52addb3c2d9d2 100644
--- a/src/legacy/core_plugins/vis_type_timelion/public/timelion_vis_type.tsx
+++ b/src/plugins/vis_type_timelion/public/timelion_vis_type.tsx
@@ -20,11 +20,11 @@
import React from 'react';
import { i18n } from '@kbn/i18n';
-import { KibanaContextProvider } from '../../../../plugins/kibana_react/public';
-import { DefaultEditorSize } from '../../../../plugins/vis_default_editor/public';
+import { KibanaContextProvider } from '../../kibana_react/public';
+import { DefaultEditorSize } from '../../vis_default_editor/public';
import { getTimelionRequestHandler } from './helpers/timelion_request_handler';
import { TimelionVisComponent, TimelionVisComponentProp } from './components';
-import { TimelionOptions } from './timelion_options';
+import { TimelionOptions, TimelionOptionsProps } from './timelion_options';
import { TimelionVisDependencies } from './plugin';
export const TIMELION_VIS_NAME = 'timelion';
@@ -53,7 +53,11 @@ export function getTimelionVisDefinition(dependencies: TimelionVisDependencies)
),
},
editorConfig: {
- optionsTemplate: TimelionOptions,
+ optionsTemplate: (props: TimelionOptionsProps) => (
+
+
+
+ ),
defaultSize: DefaultEditorSize.MEDIUM,
},
requestHandler: timelionRequestHandler,
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.axislabels.js b/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.axislabels.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.axislabels.js
rename to src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.axislabels.js
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.crosshair.js b/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.crosshair.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.crosshair.js
rename to src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.crosshair.js
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.js b/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.js
rename to src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.js
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.selection.js b/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.selection.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.selection.js
rename to src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.selection.js
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.stack.js b/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.stack.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.stack.js
rename to src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.stack.js
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.symbol.js b/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.symbol.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.symbol.js
rename to src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.symbol.js
diff --git a/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.time.js b/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.time.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.time.js
rename to src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.time.js
diff --git a/src/plugins/timelion/server/fit_functions/average.js b/src/plugins/vis_type_timelion/server/fit_functions/average.js
similarity index 100%
rename from src/plugins/timelion/server/fit_functions/average.js
rename to src/plugins/vis_type_timelion/server/fit_functions/average.js
diff --git a/src/plugins/timelion/server/fit_functions/average.test.js b/src/plugins/vis_type_timelion/server/fit_functions/average.test.js
similarity index 100%
rename from src/plugins/timelion/server/fit_functions/average.test.js
rename to src/plugins/vis_type_timelion/server/fit_functions/average.test.js
diff --git a/src/plugins/timelion/server/fit_functions/carry.js b/src/plugins/vis_type_timelion/server/fit_functions/carry.js
similarity index 100%
rename from src/plugins/timelion/server/fit_functions/carry.js
rename to src/plugins/vis_type_timelion/server/fit_functions/carry.js
diff --git a/src/plugins/timelion/server/fit_functions/carry.test.js b/src/plugins/vis_type_timelion/server/fit_functions/carry.test.js
similarity index 100%
rename from src/plugins/timelion/server/fit_functions/carry.test.js
rename to src/plugins/vis_type_timelion/server/fit_functions/carry.test.js
diff --git a/src/plugins/timelion/server/fit_functions/nearest.js b/src/plugins/vis_type_timelion/server/fit_functions/nearest.js
similarity index 100%
rename from src/plugins/timelion/server/fit_functions/nearest.js
rename to src/plugins/vis_type_timelion/server/fit_functions/nearest.js
diff --git a/src/plugins/timelion/server/fit_functions/none.js b/src/plugins/vis_type_timelion/server/fit_functions/none.js
similarity index 100%
rename from src/plugins/timelion/server/fit_functions/none.js
rename to src/plugins/vis_type_timelion/server/fit_functions/none.js
diff --git a/src/plugins/timelion/server/fit_functions/scale.js b/src/plugins/vis_type_timelion/server/fit_functions/scale.js
similarity index 100%
rename from src/plugins/timelion/server/fit_functions/scale.js
rename to src/plugins/vis_type_timelion/server/fit_functions/scale.js
diff --git a/src/plugins/timelion/server/handlers/chain_runner.js b/src/plugins/vis_type_timelion/server/handlers/chain_runner.js
similarity index 100%
rename from src/plugins/timelion/server/handlers/chain_runner.js
rename to src/plugins/vis_type_timelion/server/handlers/chain_runner.js
diff --git a/src/plugins/timelion/server/handlers/lib/arg_type.js b/src/plugins/vis_type_timelion/server/handlers/lib/arg_type.js
similarity index 100%
rename from src/plugins/timelion/server/handlers/lib/arg_type.js
rename to src/plugins/vis_type_timelion/server/handlers/lib/arg_type.js
diff --git a/src/plugins/timelion/server/handlers/lib/index_arguments.js b/src/plugins/vis_type_timelion/server/handlers/lib/index_arguments.js
similarity index 100%
rename from src/plugins/timelion/server/handlers/lib/index_arguments.js
rename to src/plugins/vis_type_timelion/server/handlers/lib/index_arguments.js
diff --git a/src/plugins/timelion/server/handlers/lib/parse_sheet.js b/src/plugins/vis_type_timelion/server/handlers/lib/parse_sheet.js
similarity index 100%
rename from src/plugins/timelion/server/handlers/lib/parse_sheet.js
rename to src/plugins/vis_type_timelion/server/handlers/lib/parse_sheet.js
diff --git a/src/plugins/timelion/server/handlers/lib/parse_sheet.test.js b/src/plugins/vis_type_timelion/server/handlers/lib/parse_sheet.test.js
similarity index 100%
rename from src/plugins/timelion/server/handlers/lib/parse_sheet.test.js
rename to src/plugins/vis_type_timelion/server/handlers/lib/parse_sheet.test.js
diff --git a/src/plugins/timelion/server/handlers/lib/preprocess_chain.js b/src/plugins/vis_type_timelion/server/handlers/lib/preprocess_chain.js
similarity index 100%
rename from src/plugins/timelion/server/handlers/lib/preprocess_chain.js
rename to src/plugins/vis_type_timelion/server/handlers/lib/preprocess_chain.js
diff --git a/src/plugins/timelion/server/handlers/lib/reposition_arguments.js b/src/plugins/vis_type_timelion/server/handlers/lib/reposition_arguments.js
similarity index 100%
rename from src/plugins/timelion/server/handlers/lib/reposition_arguments.js
rename to src/plugins/vis_type_timelion/server/handlers/lib/reposition_arguments.js
diff --git a/src/plugins/timelion/server/handlers/lib/tl_config.js b/src/plugins/vis_type_timelion/server/handlers/lib/tl_config.js
similarity index 100%
rename from src/plugins/timelion/server/handlers/lib/tl_config.js
rename to src/plugins/vis_type_timelion/server/handlers/lib/tl_config.js
diff --git a/src/plugins/timelion/server/handlers/lib/validate_arg.js b/src/plugins/vis_type_timelion/server/handlers/lib/validate_arg.js
similarity index 100%
rename from src/plugins/timelion/server/handlers/lib/validate_arg.js
rename to src/plugins/vis_type_timelion/server/handlers/lib/validate_arg.js
diff --git a/src/plugins/timelion/server/handlers/lib/validate_time.js b/src/plugins/vis_type_timelion/server/handlers/lib/validate_time.js
similarity index 100%
rename from src/plugins/timelion/server/handlers/lib/validate_time.js
rename to src/plugins/vis_type_timelion/server/handlers/lib/validate_time.js
diff --git a/src/plugins/timelion/server/index.ts b/src/plugins/vis_type_timelion/server/index.ts
similarity index 64%
rename from src/plugins/timelion/server/index.ts
rename to src/plugins/vis_type_timelion/server/index.ts
index 5d420327f961e..b40ab2af2b0d7 100644
--- a/src/plugins/timelion/server/index.ts
+++ b/src/plugins/vis_type_timelion/server/index.ts
@@ -17,19 +17,23 @@
* under the License.
*/
-import { PluginInitializerContext } from '../../../../src/core/server';
-import { configSchema } from '../config';
+import { PluginConfigDescriptor, PluginInitializerContext } from '../../../../src/core/server';
+import { configSchema, ConfigSchema } from '../config';
import { Plugin } from './plugin';
export { PluginSetupContract } from './plugin';
-export const config = {
+export const config: PluginConfigDescriptor = {
schema: configSchema,
exposeToBrowser: {
- ui: {
- enabled: true,
- },
+ ui: true,
},
+ deprecations: ({ renameFromRoot }) => [
+ renameFromRoot('timelion_vis.enabled', 'vis_type_timelion.enabled'),
+ renameFromRoot('timelion.enabled', 'vis_type_timelion.enabled'),
+ renameFromRoot('timelion.graphiteUrls', 'vis_type_timelion.graphiteUrls'),
+ renameFromRoot('timelion.ui.enabled', 'vis_type_timelion.ui.enabled'),
+ ],
};
export const plugin = (initializerContext: PluginInitializerContext) =>
new Plugin(initializerContext);
diff --git a/src/plugins/timelion/server/lib/alter.js b/src/plugins/vis_type_timelion/server/lib/alter.js
similarity index 100%
rename from src/plugins/timelion/server/lib/alter.js
rename to src/plugins/vis_type_timelion/server/lib/alter.js
diff --git a/src/plugins/timelion/server/lib/as_sorted.js b/src/plugins/vis_type_timelion/server/lib/as_sorted.js
similarity index 100%
rename from src/plugins/timelion/server/lib/as_sorted.js
rename to src/plugins/vis_type_timelion/server/lib/as_sorted.js
diff --git a/src/plugins/timelion/server/lib/build_target.js b/src/plugins/vis_type_timelion/server/lib/build_target.js
similarity index 100%
rename from src/plugins/timelion/server/lib/build_target.js
rename to src/plugins/vis_type_timelion/server/lib/build_target.js
diff --git a/src/plugins/timelion/server/lib/classes/chainable.js b/src/plugins/vis_type_timelion/server/lib/classes/chainable.js
similarity index 100%
rename from src/plugins/timelion/server/lib/classes/chainable.js
rename to src/plugins/vis_type_timelion/server/lib/classes/chainable.js
diff --git a/src/plugins/timelion/server/lib/classes/datasource.js b/src/plugins/vis_type_timelion/server/lib/classes/datasource.js
similarity index 100%
rename from src/plugins/timelion/server/lib/classes/datasource.js
rename to src/plugins/vis_type_timelion/server/lib/classes/datasource.js
diff --git a/src/plugins/timelion/server/lib/classes/timelion_function.d.ts b/src/plugins/vis_type_timelion/server/lib/classes/timelion_function.d.ts
similarity index 100%
rename from src/plugins/timelion/server/lib/classes/timelion_function.d.ts
rename to src/plugins/vis_type_timelion/server/lib/classes/timelion_function.d.ts
diff --git a/src/plugins/timelion/server/lib/classes/timelion_function.js b/src/plugins/vis_type_timelion/server/lib/classes/timelion_function.js
similarity index 100%
rename from src/plugins/timelion/server/lib/classes/timelion_function.js
rename to src/plugins/vis_type_timelion/server/lib/classes/timelion_function.js
diff --git a/src/plugins/timelion/server/lib/config_manager.ts b/src/plugins/vis_type_timelion/server/lib/config_manager.ts
similarity index 100%
rename from src/plugins/timelion/server/lib/config_manager.ts
rename to src/plugins/vis_type_timelion/server/lib/config_manager.ts
diff --git a/src/plugins/timelion/server/lib/functions_md.js b/src/plugins/vis_type_timelion/server/lib/functions_md.js
similarity index 100%
rename from src/plugins/timelion/server/lib/functions_md.js
rename to src/plugins/vis_type_timelion/server/lib/functions_md.js
diff --git a/src/plugins/timelion/server/lib/get_namespaced_settings.js b/src/plugins/vis_type_timelion/server/lib/get_namespaced_settings.js
similarity index 100%
rename from src/plugins/timelion/server/lib/get_namespaced_settings.js
rename to src/plugins/vis_type_timelion/server/lib/get_namespaced_settings.js
diff --git a/src/plugins/timelion/server/lib/load_functions.d.ts b/src/plugins/vis_type_timelion/server/lib/load_functions.d.ts
similarity index 100%
rename from src/plugins/timelion/server/lib/load_functions.d.ts
rename to src/plugins/vis_type_timelion/server/lib/load_functions.d.ts
diff --git a/src/plugins/timelion/server/lib/load_functions.js b/src/plugins/vis_type_timelion/server/lib/load_functions.js
similarity index 100%
rename from src/plugins/timelion/server/lib/load_functions.js
rename to src/plugins/vis_type_timelion/server/lib/load_functions.js
diff --git a/src/plugins/timelion/server/lib/load_functions.test.js b/src/plugins/vis_type_timelion/server/lib/load_functions.test.js
similarity index 94%
rename from src/plugins/timelion/server/lib/load_functions.test.js
rename to src/plugins/vis_type_timelion/server/lib/load_functions.test.js
index ebe1a04532e05..b4f83611a7773 100644
--- a/src/plugins/timelion/server/lib/load_functions.test.js
+++ b/src/plugins/vis_type_timelion/server/lib/load_functions.test.js
@@ -17,7 +17,7 @@
* under the License.
*/
-const fn = require(`src/plugins/timelion/server/lib/load_functions`);
+const fn = require(`src/plugins/vis_type_timelion/server/lib/load_functions`);
const expect = require('chai').expect;
diff --git a/src/plugins/timelion/server/lib/offset_time.js b/src/plugins/vis_type_timelion/server/lib/offset_time.js
similarity index 100%
rename from src/plugins/timelion/server/lib/offset_time.js
rename to src/plugins/vis_type_timelion/server/lib/offset_time.js
diff --git a/src/plugins/timelion/server/lib/offset_time.test.js b/src/plugins/vis_type_timelion/server/lib/offset_time.test.js
similarity index 100%
rename from src/plugins/timelion/server/lib/offset_time.test.js
rename to src/plugins/vis_type_timelion/server/lib/offset_time.test.js
diff --git a/src/plugins/timelion/server/lib/process_function_definition.js b/src/plugins/vis_type_timelion/server/lib/process_function_definition.js
similarity index 100%
rename from src/plugins/timelion/server/lib/process_function_definition.js
rename to src/plugins/vis_type_timelion/server/lib/process_function_definition.js
diff --git a/src/plugins/timelion/server/lib/reduce.js b/src/plugins/vis_type_timelion/server/lib/reduce.js
similarity index 100%
rename from src/plugins/timelion/server/lib/reduce.js
rename to src/plugins/vis_type_timelion/server/lib/reduce.js
diff --git a/src/plugins/timelion/server/lib/split_interval.js b/src/plugins/vis_type_timelion/server/lib/split_interval.js
similarity index 100%
rename from src/plugins/timelion/server/lib/split_interval.js
rename to src/plugins/vis_type_timelion/server/lib/split_interval.js
diff --git a/src/plugins/timelion/server/lib/unzip_pairs.js b/src/plugins/vis_type_timelion/server/lib/unzip_pairs.js
similarity index 100%
rename from src/plugins/timelion/server/lib/unzip_pairs.js
rename to src/plugins/vis_type_timelion/server/lib/unzip_pairs.js
diff --git a/src/plugins/timelion/server/plugin.ts b/src/plugins/vis_type_timelion/server/plugin.ts
similarity index 100%
rename from src/plugins/timelion/server/plugin.ts
rename to src/plugins/vis_type_timelion/server/plugin.ts
diff --git a/src/plugins/timelion/server/routes/functions.ts b/src/plugins/vis_type_timelion/server/routes/functions.ts
similarity index 100%
rename from src/plugins/timelion/server/routes/functions.ts
rename to src/plugins/vis_type_timelion/server/routes/functions.ts
diff --git a/src/plugins/timelion/server/routes/run.ts b/src/plugins/vis_type_timelion/server/routes/run.ts
similarity index 100%
rename from src/plugins/timelion/server/routes/run.ts
rename to src/plugins/vis_type_timelion/server/routes/run.ts
diff --git a/src/plugins/timelion/server/routes/validate_es.ts b/src/plugins/vis_type_timelion/server/routes/validate_es.ts
similarity index 100%
rename from src/plugins/timelion/server/routes/validate_es.ts
rename to src/plugins/vis_type_timelion/server/routes/validate_es.ts
diff --git a/src/plugins/timelion/server/series_functions/abs.js b/src/plugins/vis_type_timelion/server/series_functions/abs.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/abs.js
rename to src/plugins/vis_type_timelion/server/series_functions/abs.js
diff --git a/src/plugins/timelion/server/series_functions/abs.test.js b/src/plugins/vis_type_timelion/server/series_functions/abs.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/abs.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/abs.test.js
diff --git a/src/plugins/timelion/server/series_functions/aggregate/aggregate.test.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/aggregate.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/aggregate/aggregate.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/aggregate/aggregate.test.js
diff --git a/src/plugins/timelion/server/series_functions/aggregate/avg.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/avg.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/aggregate/avg.js
rename to src/plugins/vis_type_timelion/server/series_functions/aggregate/avg.js
diff --git a/src/plugins/timelion/server/series_functions/aggregate/cardinality.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/cardinality.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/aggregate/cardinality.js
rename to src/plugins/vis_type_timelion/server/series_functions/aggregate/cardinality.js
diff --git a/src/plugins/timelion/server/series_functions/aggregate/first.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/first.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/aggregate/first.js
rename to src/plugins/vis_type_timelion/server/series_functions/aggregate/first.js
diff --git a/src/plugins/timelion/server/series_functions/aggregate/index.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/index.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/aggregate/index.js
rename to src/plugins/vis_type_timelion/server/series_functions/aggregate/index.js
diff --git a/src/plugins/timelion/server/series_functions/aggregate/last.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/last.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/aggregate/last.js
rename to src/plugins/vis_type_timelion/server/series_functions/aggregate/last.js
diff --git a/src/plugins/timelion/server/series_functions/aggregate/max.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/max.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/aggregate/max.js
rename to src/plugins/vis_type_timelion/server/series_functions/aggregate/max.js
diff --git a/src/plugins/timelion/server/series_functions/aggregate/min.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/min.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/aggregate/min.js
rename to src/plugins/vis_type_timelion/server/series_functions/aggregate/min.js
diff --git a/src/plugins/timelion/server/series_functions/aggregate/sum.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/sum.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/aggregate/sum.js
rename to src/plugins/vis_type_timelion/server/series_functions/aggregate/sum.js
diff --git a/src/plugins/timelion/server/series_functions/bars.js b/src/plugins/vis_type_timelion/server/series_functions/bars.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/bars.js
rename to src/plugins/vis_type_timelion/server/series_functions/bars.js
diff --git a/src/plugins/timelion/server/series_functions/bars.test.js b/src/plugins/vis_type_timelion/server/series_functions/bars.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/bars.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/bars.test.js
diff --git a/src/plugins/timelion/server/series_functions/color.js b/src/plugins/vis_type_timelion/server/series_functions/color.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/color.js
rename to src/plugins/vis_type_timelion/server/series_functions/color.js
diff --git a/src/plugins/timelion/server/series_functions/color.test.js b/src/plugins/vis_type_timelion/server/series_functions/color.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/color.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/color.test.js
diff --git a/src/plugins/timelion/server/series_functions/condition.js b/src/plugins/vis_type_timelion/server/series_functions/condition.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/condition.js
rename to src/plugins/vis_type_timelion/server/series_functions/condition.js
diff --git a/src/plugins/timelion/server/series_functions/condition.test.js b/src/plugins/vis_type_timelion/server/series_functions/condition.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/condition.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/condition.test.js
diff --git a/src/plugins/timelion/server/series_functions/cusum.js b/src/plugins/vis_type_timelion/server/series_functions/cusum.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/cusum.js
rename to src/plugins/vis_type_timelion/server/series_functions/cusum.js
diff --git a/src/plugins/timelion/server/series_functions/cusum.test.js b/src/plugins/vis_type_timelion/server/series_functions/cusum.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/cusum.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/cusum.test.js
diff --git a/src/plugins/timelion/server/series_functions/derivative.js b/src/plugins/vis_type_timelion/server/series_functions/derivative.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/derivative.js
rename to src/plugins/vis_type_timelion/server/series_functions/derivative.js
diff --git a/src/plugins/timelion/server/series_functions/derivative.test.js b/src/plugins/vis_type_timelion/server/series_functions/derivative.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/derivative.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/derivative.test.js
diff --git a/src/plugins/timelion/server/series_functions/divide.js b/src/plugins/vis_type_timelion/server/series_functions/divide.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/divide.js
rename to src/plugins/vis_type_timelion/server/series_functions/divide.js
diff --git a/src/plugins/timelion/server/series_functions/divide.test.js b/src/plugins/vis_type_timelion/server/series_functions/divide.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/divide.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/divide.test.js
diff --git a/src/plugins/timelion/server/series_functions/es/es.test.js b/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/es/es.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/es/es.test.js
diff --git a/src/plugins/timelion/server/series_functions/es/index.js b/src/plugins/vis_type_timelion/server/series_functions/es/index.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/es/index.js
rename to src/plugins/vis_type_timelion/server/series_functions/es/index.js
diff --git a/src/plugins/timelion/server/series_functions/es/lib/agg_body.js b/src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_body.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/es/lib/agg_body.js
rename to src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_body.js
diff --git a/src/plugins/timelion/server/series_functions/es/lib/agg_response_to_series_list.js b/src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_response_to_series_list.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/es/lib/agg_response_to_series_list.js
rename to src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_response_to_series_list.js
diff --git a/src/plugins/timelion/server/series_functions/es/lib/build_request.js b/src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/es/lib/build_request.js
rename to src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js
diff --git a/src/plugins/timelion/server/series_functions/es/lib/create_date_agg.js b/src/plugins/vis_type_timelion/server/series_functions/es/lib/create_date_agg.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/es/lib/create_date_agg.js
rename to src/plugins/vis_type_timelion/server/series_functions/es/lib/create_date_agg.js
diff --git a/src/plugins/timelion/server/series_functions/first.js b/src/plugins/vis_type_timelion/server/series_functions/first.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/first.js
rename to src/plugins/vis_type_timelion/server/series_functions/first.js
diff --git a/src/plugins/timelion/server/series_functions/first.test.js b/src/plugins/vis_type_timelion/server/series_functions/first.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/first.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/first.test.js
diff --git a/src/plugins/timelion/server/series_functions/fit.js b/src/plugins/vis_type_timelion/server/series_functions/fit.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/fit.js
rename to src/plugins/vis_type_timelion/server/series_functions/fit.js
diff --git a/src/plugins/timelion/server/series_functions/fit.test.js b/src/plugins/vis_type_timelion/server/series_functions/fit.test.js
similarity index 98%
rename from src/plugins/timelion/server/series_functions/fit.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/fit.test.js
index 75eaa2a50ea72..6622259a1fd87 100644
--- a/src/plugins/timelion/server/series_functions/fit.test.js
+++ b/src/plugins/vis_type_timelion/server/series_functions/fit.test.js
@@ -17,7 +17,7 @@
* under the License.
*/
-const fn = require(`src/plugins/timelion/server/series_functions/fit`);
+const fn = require(`src/plugins/vis_type_timelion/server/series_functions/fit`);
import moment from 'moment';
const expect = require('chai').expect;
import invoke from './helpers/invoke_series_fn.js';
diff --git a/src/plugins/timelion/server/series_functions/fixtures/bucket_list.js b/src/plugins/vis_type_timelion/server/series_functions/fixtures/bucket_list.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/fixtures/bucket_list.js
rename to src/plugins/vis_type_timelion/server/series_functions/fixtures/bucket_list.js
diff --git a/src/plugins/timelion/server/series_functions/fixtures/es_response.js b/src/plugins/vis_type_timelion/server/series_functions/fixtures/es_response.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/fixtures/es_response.js
rename to src/plugins/vis_type_timelion/server/series_functions/fixtures/es_response.js
diff --git a/src/plugins/timelion/server/series_functions/fixtures/series_list.js b/src/plugins/vis_type_timelion/server/series_functions/fixtures/series_list.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/fixtures/series_list.js
rename to src/plugins/vis_type_timelion/server/series_functions/fixtures/series_list.js
diff --git a/src/plugins/timelion/server/series_functions/fixtures/tl_config.js b/src/plugins/vis_type_timelion/server/series_functions/fixtures/tl_config.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/fixtures/tl_config.js
rename to src/plugins/vis_type_timelion/server/series_functions/fixtures/tl_config.js
diff --git a/src/plugins/timelion/server/series_functions/graphite.js b/src/plugins/vis_type_timelion/server/series_functions/graphite.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/graphite.js
rename to src/plugins/vis_type_timelion/server/series_functions/graphite.js
diff --git a/src/plugins/timelion/server/series_functions/graphite.test.js b/src/plugins/vis_type_timelion/server/series_functions/graphite.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/graphite.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/graphite.test.js
diff --git a/src/plugins/timelion/server/series_functions/helpers/get_series.js b/src/plugins/vis_type_timelion/server/series_functions/helpers/get_series.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/helpers/get_series.js
rename to src/plugins/vis_type_timelion/server/series_functions/helpers/get_series.js
diff --git a/src/plugins/timelion/server/series_functions/helpers/get_series_list.js b/src/plugins/vis_type_timelion/server/series_functions/helpers/get_series_list.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/helpers/get_series_list.js
rename to src/plugins/vis_type_timelion/server/series_functions/helpers/get_series_list.js
diff --git a/src/plugins/timelion/server/series_functions/helpers/get_single_series_list.js b/src/plugins/vis_type_timelion/server/series_functions/helpers/get_single_series_list.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/helpers/get_single_series_list.js
rename to src/plugins/vis_type_timelion/server/series_functions/helpers/get_single_series_list.js
diff --git a/src/plugins/timelion/server/series_functions/helpers/invoke_series_fn.js b/src/plugins/vis_type_timelion/server/series_functions/helpers/invoke_series_fn.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/helpers/invoke_series_fn.js
rename to src/plugins/vis_type_timelion/server/series_functions/helpers/invoke_series_fn.js
diff --git a/src/plugins/timelion/server/series_functions/hide.js b/src/plugins/vis_type_timelion/server/series_functions/hide.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/hide.js
rename to src/plugins/vis_type_timelion/server/series_functions/hide.js
diff --git a/src/plugins/timelion/server/series_functions/hide.test.js b/src/plugins/vis_type_timelion/server/series_functions/hide.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/hide.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/hide.test.js
diff --git a/src/plugins/timelion/server/series_functions/holt/index.js b/src/plugins/vis_type_timelion/server/series_functions/holt/index.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/holt/index.js
rename to src/plugins/vis_type_timelion/server/series_functions/holt/index.js
diff --git a/src/plugins/timelion/server/series_functions/holt/lib/des.js b/src/plugins/vis_type_timelion/server/series_functions/holt/lib/des.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/holt/lib/des.js
rename to src/plugins/vis_type_timelion/server/series_functions/holt/lib/des.js
diff --git a/src/plugins/timelion/server/series_functions/holt/lib/ses.js b/src/plugins/vis_type_timelion/server/series_functions/holt/lib/ses.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/holt/lib/ses.js
rename to src/plugins/vis_type_timelion/server/series_functions/holt/lib/ses.js
diff --git a/src/plugins/timelion/server/series_functions/holt/lib/tes.js b/src/plugins/vis_type_timelion/server/series_functions/holt/lib/tes.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/holt/lib/tes.js
rename to src/plugins/vis_type_timelion/server/series_functions/holt/lib/tes.js
diff --git a/src/plugins/timelion/server/series_functions/label.js b/src/plugins/vis_type_timelion/server/series_functions/label.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/label.js
rename to src/plugins/vis_type_timelion/server/series_functions/label.js
diff --git a/src/plugins/timelion/server/series_functions/label.test.js b/src/plugins/vis_type_timelion/server/series_functions/label.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/label.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/label.test.js
diff --git a/src/plugins/timelion/server/series_functions/legend.js b/src/plugins/vis_type_timelion/server/series_functions/legend.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/legend.js
rename to src/plugins/vis_type_timelion/server/series_functions/legend.js
diff --git a/src/plugins/timelion/server/series_functions/legend.test.js b/src/plugins/vis_type_timelion/server/series_functions/legend.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/legend.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/legend.test.js
diff --git a/src/plugins/timelion/server/series_functions/lines.js b/src/plugins/vis_type_timelion/server/series_functions/lines.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/lines.js
rename to src/plugins/vis_type_timelion/server/series_functions/lines.js
diff --git a/src/plugins/timelion/server/series_functions/lines.test.js b/src/plugins/vis_type_timelion/server/series_functions/lines.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/lines.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/lines.test.js
diff --git a/src/plugins/timelion/server/series_functions/log.js b/src/plugins/vis_type_timelion/server/series_functions/log.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/log.js
rename to src/plugins/vis_type_timelion/server/series_functions/log.js
diff --git a/src/plugins/timelion/server/series_functions/log.test.js b/src/plugins/vis_type_timelion/server/series_functions/log.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/log.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/log.test.js
diff --git a/src/plugins/timelion/server/series_functions/max.js b/src/plugins/vis_type_timelion/server/series_functions/max.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/max.js
rename to src/plugins/vis_type_timelion/server/series_functions/max.js
diff --git a/src/plugins/timelion/server/series_functions/max.test.js b/src/plugins/vis_type_timelion/server/series_functions/max.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/max.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/max.test.js
diff --git a/src/plugins/timelion/server/series_functions/min.js b/src/plugins/vis_type_timelion/server/series_functions/min.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/min.js
rename to src/plugins/vis_type_timelion/server/series_functions/min.js
diff --git a/src/plugins/timelion/server/series_functions/min.test.js b/src/plugins/vis_type_timelion/server/series_functions/min.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/min.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/min.test.js
diff --git a/src/plugins/timelion/server/series_functions/movingaverage.js b/src/plugins/vis_type_timelion/server/series_functions/movingaverage.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/movingaverage.js
rename to src/plugins/vis_type_timelion/server/series_functions/movingaverage.js
diff --git a/src/plugins/timelion/server/series_functions/movingaverage.test.js b/src/plugins/vis_type_timelion/server/series_functions/movingaverage.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/movingaverage.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/movingaverage.test.js
diff --git a/src/plugins/timelion/server/series_functions/movingstd.js b/src/plugins/vis_type_timelion/server/series_functions/movingstd.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/movingstd.js
rename to src/plugins/vis_type_timelion/server/series_functions/movingstd.js
diff --git a/src/plugins/timelion/server/series_functions/movingstd.test.js b/src/plugins/vis_type_timelion/server/series_functions/movingstd.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/movingstd.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/movingstd.test.js
diff --git a/src/plugins/timelion/server/series_functions/multiply.js b/src/plugins/vis_type_timelion/server/series_functions/multiply.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/multiply.js
rename to src/plugins/vis_type_timelion/server/series_functions/multiply.js
diff --git a/src/plugins/timelion/server/series_functions/multiply.test.js b/src/plugins/vis_type_timelion/server/series_functions/multiply.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/multiply.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/multiply.test.js
diff --git a/src/plugins/timelion/server/series_functions/points.js b/src/plugins/vis_type_timelion/server/series_functions/points.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/points.js
rename to src/plugins/vis_type_timelion/server/series_functions/points.js
diff --git a/src/plugins/timelion/server/series_functions/points.test.js b/src/plugins/vis_type_timelion/server/series_functions/points.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/points.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/points.test.js
diff --git a/src/plugins/timelion/server/series_functions/precision.js b/src/plugins/vis_type_timelion/server/series_functions/precision.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/precision.js
rename to src/plugins/vis_type_timelion/server/series_functions/precision.js
diff --git a/src/plugins/timelion/server/series_functions/precision.test.js b/src/plugins/vis_type_timelion/server/series_functions/precision.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/precision.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/precision.test.js
diff --git a/src/plugins/timelion/server/series_functions/props.js b/src/plugins/vis_type_timelion/server/series_functions/props.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/props.js
rename to src/plugins/vis_type_timelion/server/series_functions/props.js
diff --git a/src/plugins/timelion/server/series_functions/quandl.js b/src/plugins/vis_type_timelion/server/series_functions/quandl.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/quandl.js
rename to src/plugins/vis_type_timelion/server/series_functions/quandl.js
diff --git a/src/plugins/timelion/server/series_functions/quandl.test.js b/src/plugins/vis_type_timelion/server/series_functions/quandl.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/quandl.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/quandl.test.js
diff --git a/src/plugins/timelion/server/series_functions/range.js b/src/plugins/vis_type_timelion/server/series_functions/range.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/range.js
rename to src/plugins/vis_type_timelion/server/series_functions/range.js
diff --git a/src/plugins/timelion/server/series_functions/range.test.js b/src/plugins/vis_type_timelion/server/series_functions/range.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/range.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/range.test.js
diff --git a/src/plugins/timelion/server/series_functions/scale_interval.js b/src/plugins/vis_type_timelion/server/series_functions/scale_interval.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/scale_interval.js
rename to src/plugins/vis_type_timelion/server/series_functions/scale_interval.js
diff --git a/src/plugins/timelion/server/series_functions/scale_interval.test.js b/src/plugins/vis_type_timelion/server/series_functions/scale_interval.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/scale_interval.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/scale_interval.test.js
diff --git a/src/plugins/timelion/server/series_functions/static.js b/src/plugins/vis_type_timelion/server/series_functions/static.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/static.js
rename to src/plugins/vis_type_timelion/server/series_functions/static.js
diff --git a/src/plugins/timelion/server/series_functions/static.test.js b/src/plugins/vis_type_timelion/server/series_functions/static.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/static.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/static.test.js
diff --git a/src/plugins/timelion/server/series_functions/subtract.js b/src/plugins/vis_type_timelion/server/series_functions/subtract.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/subtract.js
rename to src/plugins/vis_type_timelion/server/series_functions/subtract.js
diff --git a/src/plugins/timelion/server/series_functions/subtract.test.js b/src/plugins/vis_type_timelion/server/series_functions/subtract.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/subtract.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/subtract.test.js
diff --git a/src/plugins/timelion/server/series_functions/sum.js b/src/plugins/vis_type_timelion/server/series_functions/sum.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/sum.js
rename to src/plugins/vis_type_timelion/server/series_functions/sum.js
diff --git a/src/plugins/timelion/server/series_functions/sum.test.js b/src/plugins/vis_type_timelion/server/series_functions/sum.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/sum.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/sum.test.js
diff --git a/src/plugins/timelion/server/series_functions/title.js b/src/plugins/vis_type_timelion/server/series_functions/title.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/title.js
rename to src/plugins/vis_type_timelion/server/series_functions/title.js
diff --git a/src/plugins/timelion/server/series_functions/title.test.js b/src/plugins/vis_type_timelion/server/series_functions/title.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/title.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/title.test.js
diff --git a/src/plugins/timelion/server/series_functions/trend/index.js b/src/plugins/vis_type_timelion/server/series_functions/trend/index.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/trend/index.js
rename to src/plugins/vis_type_timelion/server/series_functions/trend/index.js
diff --git a/src/plugins/timelion/server/series_functions/trend/lib/regress.js b/src/plugins/vis_type_timelion/server/series_functions/trend/lib/regress.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/trend/lib/regress.js
rename to src/plugins/vis_type_timelion/server/series_functions/trend/lib/regress.js
diff --git a/src/plugins/timelion/server/series_functions/trim.js b/src/plugins/vis_type_timelion/server/series_functions/trim.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/trim.js
rename to src/plugins/vis_type_timelion/server/series_functions/trim.js
diff --git a/src/plugins/timelion/server/series_functions/trim.test.js b/src/plugins/vis_type_timelion/server/series_functions/trim.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/trim.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/trim.test.js
diff --git a/src/plugins/timelion/server/series_functions/worldbank.js b/src/plugins/vis_type_timelion/server/series_functions/worldbank.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/worldbank.js
rename to src/plugins/vis_type_timelion/server/series_functions/worldbank.js
diff --git a/src/plugins/timelion/server/series_functions/worldbank_indicators.js b/src/plugins/vis_type_timelion/server/series_functions/worldbank_indicators.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/worldbank_indicators.js
rename to src/plugins/vis_type_timelion/server/series_functions/worldbank_indicators.js
diff --git a/src/plugins/timelion/server/series_functions/yaxis.js b/src/plugins/vis_type_timelion/server/series_functions/yaxis.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/yaxis.js
rename to src/plugins/vis_type_timelion/server/series_functions/yaxis.js
diff --git a/src/plugins/timelion/server/series_functions/yaxis.test.js b/src/plugins/vis_type_timelion/server/series_functions/yaxis.test.js
similarity index 100%
rename from src/plugins/timelion/server/series_functions/yaxis.test.js
rename to src/plugins/vis_type_timelion/server/series_functions/yaxis.test.js
diff --git a/src/plugins/timelion/server/timelion.json b/src/plugins/vis_type_timelion/server/timelion.json
similarity index 100%
rename from src/plugins/timelion/server/timelion.json
rename to src/plugins/vis_type_timelion/server/timelion.json
diff --git a/src/plugins/timelion/server/types.ts b/src/plugins/vis_type_timelion/server/types.ts
similarity index 100%
rename from src/plugins/timelion/server/types.ts
rename to src/plugins/vis_type_timelion/server/types.ts
diff --git a/src/plugins/vis_type_timeseries/kibana.json b/src/plugins/vis_type_timeseries/kibana.json
index 305e159ac2505..38662c6a7ff89 100644
--- a/src/plugins/vis_type_timeseries/kibana.json
+++ b/src/plugins/vis_type_timeseries/kibana.json
@@ -1,5 +1,5 @@
{
- "id": "metrics",
+ "id": "visTypeTimeseries",
"version": "8.0.0",
"kibanaVersion": "kibana",
"server": true,
diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy.ts b/src/plugins/vis_type_timeseries/server/config.ts
similarity index 68%
rename from src/legacy/core_plugins/kibana/public/visualize/legacy.ts
rename to src/plugins/vis_type_timeseries/server/config.ts
index 4ef2c93689714..f4668eff8fa04 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/legacy.ts
+++ b/src/plugins/vis_type_timeseries/server/config.ts
@@ -17,12 +17,15 @@
* under the License.
*/
-import { PluginInitializerContext } from 'kibana/public';
-import { npSetup, npStart } from 'ui/new_platform';
-import { plugin } from './index';
+import { schema, TypeOf } from '@kbn/config-schema';
-const instance = plugin({
- env: npSetup.plugins.kibanaLegacy.env,
-} as PluginInitializerContext);
-instance.setup(npSetup.core, npSetup.plugins);
-instance.start(npStart.core, npStart.plugins);
+export const config = schema.object({
+ enabled: schema.boolean({ defaultValue: true }),
+
+ /** @deprecated **/
+ chartResolution: schema.number({ defaultValue: 150 }),
+ /** @deprecated **/
+ minimumBucketSize: schema.number({ defaultValue: 10 }),
+});
+
+export type VisTypeTimeseriesConfig = TypeOf;
diff --git a/src/plugins/vis_type_timeseries/server/index.ts b/src/plugins/vis_type_timeseries/server/index.ts
index fa74b6e965971..f460257caf5e3 100644
--- a/src/plugins/vis_type_timeseries/server/index.ts
+++ b/src/plugins/vis_type_timeseries/server/index.ts
@@ -17,18 +17,25 @@
* under the License.
*/
-import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from 'src/core/server';
+import { VisTypeTimeseriesConfig, config as configSchema } from './config';
import { VisTypeTimeseriesPlugin } from './plugin';
+
export { VisTypeTimeseriesSetup, Framework } from './plugin';
-export const config = {
- schema: schema.object({
- enabled: schema.boolean({ defaultValue: true }),
- }),
-};
+export const config: PluginConfigDescriptor = {
+ deprecations: ({ unused, renameFromRoot }) => [
+ // In Kibana v7.8 plugin id was renamed from 'metrics' to 'vis_type_timeseries':
+ renameFromRoot('metrics.enabled', 'vis_type_timeseries.enabled', true),
+ renameFromRoot('metrics.chartResolution', 'vis_type_timeseries.chartResolution', true),
+ renameFromRoot('metrics.minimumBucketSize', 'vis_type_timeseries.minimumBucketSize', true),
-export type VisTypeTimeseriesConfig = TypeOf;
+ // Unused properties which should be removed after releasing Kibana v8.0:
+ unused('chartResolution'),
+ unused('minimumBucketSize'),
+ ],
+ schema: configSchema,
+};
export { ValidationTelemetryServiceSetup } from './validation_telemetry';
diff --git a/src/plugins/vis_type_timeseries/server/plugin.ts b/src/plugins/vis_type_timeseries/server/plugin.ts
index 6ef6362c6e37b..05257cb79a75c 100644
--- a/src/plugins/vis_type_timeseries/server/plugin.ts
+++ b/src/plugins/vis_type_timeseries/server/plugin.ts
@@ -29,7 +29,7 @@ import {
} from 'src/core/server';
import { Observable } from 'rxjs';
import { Server } from 'hapi';
-import { VisTypeTimeseriesConfig } from '.';
+import { VisTypeTimeseriesConfig } from './config';
import { getVisData, GetVisData, GetVisDataOptions } from './lib/get_vis_data';
import { ValidationTelemetryService } from './validation_telemetry';
import { UsageCollectionSetup } from '../../usage_collection/server';
diff --git a/src/plugins/vis_type_timeseries/server/validation_telemetry/saved_object_type.ts b/src/plugins/vis_type_timeseries/server/validation_telemetry/saved_object_type.ts
index 77b49e824334f..f18fa1e4cc2fa 100644
--- a/src/plugins/vis_type_timeseries/server/validation_telemetry/saved_object_type.ts
+++ b/src/plugins/vis_type_timeseries/server/validation_telemetry/saved_object_type.ts
@@ -31,7 +31,7 @@ const resetCount: SavedObjectMigrationFn = doc => ({
export const tsvbTelemetrySavedObjectType: SavedObjectsType = {
name: 'tsvb-validation-telemetry',
hidden: false,
- namespaceAgnostic: true,
+ namespaceType: 'agnostic',
mappings: {
properties: {
failedRequests: {
diff --git a/src/plugins/visualizations/public/index.scss b/src/plugins/visualizations/public/index.scss
index eada763b63c4d..2b61535f3e7f2 100644
--- a/src/plugins/visualizations/public/index.scss
+++ b/src/plugins/visualizations/public/index.scss
@@ -1,2 +1,3 @@
@import 'wizard/index';
@import 'embeddable/index';
+@import 'components/index';
diff --git a/src/plugins/visualizations/server/saved_objects/visualization.ts b/src/plugins/visualizations/server/saved_objects/visualization.ts
index 9f4782f3ec730..cd2211c185530 100644
--- a/src/plugins/visualizations/server/saved_objects/visualization.ts
+++ b/src/plugins/visualizations/server/saved_objects/visualization.ts
@@ -23,7 +23,7 @@ import { visualizationSavedObjectTypeMigrations } from './visualization_migratio
export const visualizationSavedObjectType: SavedObjectsType = {
name: 'visualization',
hidden: false,
- namespaceAgnostic: false,
+ namespaceType: 'single',
management: {
icon: 'visualizeApp',
defaultSearchField: 'title',
diff --git a/src/plugins/visualize/kibana.json b/src/plugins/visualize/kibana.json
new file mode 100644
index 0000000000000..a7afa0697a5eb
--- /dev/null
+++ b/src/plugins/visualize/kibana.json
@@ -0,0 +1,17 @@
+{
+ "id": "visualize",
+ "version": "kibana",
+ "server": false,
+ "ui": true,
+ "requiredPlugins": [
+ "data",
+ "kibanaLegacy",
+ "navigation",
+ "savedObjects",
+ "visualizations"
+ ],
+ "optionalPlugins": [
+ "home",
+ "share"
+ ]
+}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts b/src/plugins/visualize/public/application/application.ts
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
rename to src/plugins/visualize/public/application/application.ts
index 241397884c8fe..9d8a1b98ef023 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
+++ b/src/plugins/visualize/public/application/application.ts
@@ -17,16 +17,18 @@
* under the License.
*/
+import './index.scss';
+
import angular, { IModule } from 'angular';
import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
import { AppMountContext } from 'kibana/public';
-import { configureAppAngularModule } from '../legacy_imports';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../plugins/navigation/public';
+import { NavigationPublicPluginStart as NavigationStart } from 'src/plugins/navigation/public';
import {
+ configureAppAngularModule,
createTopNavDirective,
createTopNavHelper,
-} from '../../../../../../plugins/kibana_legacy/public';
+} from '../../../kibana_legacy/public';
// @ts-ignore
import { initVisualizeApp } from './legacy_app';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/breadcrumbs.ts b/src/plugins/visualize/public/application/breadcrumbs.ts
similarity index 86%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/breadcrumbs.ts
rename to src/plugins/visualize/public/application/breadcrumbs.ts
index b6a63d50b205b..972bdc1462b2c 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/breadcrumbs.ts
+++ b/src/plugins/visualize/public/application/breadcrumbs.ts
@@ -24,7 +24,7 @@ import { VisualizeConstants } from './visualize_constants';
export function getLandingBreadcrumbs() {
return [
{
- text: i18n.translate('kbn.visualize.listing.breadcrumb', {
+ text: i18n.translate('visualize.listing.breadcrumb', {
defaultMessage: 'Visualize',
}),
href: `#${VisualizeConstants.LANDING_PAGE_PATH}`,
@@ -36,7 +36,7 @@ export function getWizardStep1Breadcrumbs() {
return [
...getLandingBreadcrumbs(),
{
- text: i18n.translate('kbn.visualize.wizard.step1Breadcrumb', {
+ text: i18n.translate('visualize.wizard.step1Breadcrumb', {
defaultMessage: 'Create',
}),
},
@@ -47,7 +47,7 @@ export function getWizardStep2Breadcrumbs() {
return [
...getLandingBreadcrumbs(),
{
- text: i18n.translate('kbn.visualize.wizard.step2Breadcrumb', {
+ text: i18n.translate('visualize.wizard.step2Breadcrumb', {
defaultMessage: 'Create',
}),
},
@@ -58,7 +58,7 @@ export function getCreateBreadcrumbs() {
return [
...getLandingBreadcrumbs(),
{
- text: i18n.translate('kbn.visualize.editor.createBreadcrumb', {
+ text: i18n.translate('visualize.editor.createBreadcrumb', {
defaultMessage: 'Create',
}),
},
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_editor.scss b/src/plugins/visualize/public/application/editor/_editor.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_editor.scss
rename to src/plugins/visualize/public/application/editor/_editor.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_index.scss b/src/plugins/visualize/public/application/editor/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_index.scss
rename to src/plugins/visualize/public/application/editor/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html b/src/plugins/visualize/public/application/editor/editor.html
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html
rename to src/plugins/visualize/public/application/editor/editor.html
index 0dcacd30fba4e..a031d70ef9a83 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html
+++ b/src/plugins/visualize/public/application/editor/editor.html
@@ -80,7 +80,7 @@
) : null;
@@ -229,10 +220,10 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
: []),
{
id: 'share',
- label: i18n.translate('kbn.topNavMenu.shareVisualizationButtonLabel', {
+ label: i18n.translate('visualize.topNavMenu.shareVisualizationButtonLabel', {
defaultMessage: 'share',
}),
- description: i18n.translate('kbn.visualize.topNavMenu.shareVisualizationButtonAriaLabel', {
+ description: i18n.translate('visualize.topNavMenu.shareVisualizationButtonAriaLabel', {
defaultMessage: 'Share Visualization',
}),
testId: 'shareTopNavButton',
@@ -252,13 +243,15 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
isDirty: hasUnappliedChanges || hasUnsavedChanges,
});
},
+ // disable the Share button if no action specified
+ disableButton: !share,
},
{
id: 'inspector',
- label: i18n.translate('kbn.topNavMenu.openInspectorButtonLabel', {
+ label: i18n.translate('visualize.topNavMenu.openInspectorButtonLabel', {
defaultMessage: 'inspect',
}),
- description: i18n.translate('kbn.visualize.topNavMenu.openInspectorButtonAriaLabel', {
+ description: i18n.translate('visualize.topNavMenu.openInspectorButtonAriaLabel', {
defaultMessage: 'Open Inspector for visualization',
}),
testId: 'openInspectorButton',
@@ -274,7 +267,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
},
tooltip() {
if (!embeddableHandler.hasInspector || !embeddableHandler.hasInspector()) {
- return i18n.translate('kbn.visualize.topNavMenu.openInspectorDisabledButtonTooltip', {
+ return i18n.translate('visualize.topNavMenu.openInspectorDisabledButtonTooltip', {
defaultMessage: `This visualization doesn't support any inspectors.`,
});
}
@@ -319,7 +312,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
stopAllSyncing();
toastNotifications.addWarning({
- title: i18n.translate('kbn.visualize.visualizationTypeInvalidNotificationMessage', {
+ title: i18n.translate('visualize.visualizationTypeInvalidNotificationMessage', {
defaultMessage: 'Invalid visualization type',
}),
text: toMountPoint({error.message}),
@@ -359,7 +352,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
return;
}
- savedQueryService.getSavedQuery(savedQueryId).then(savedQuery => {
+ queryService.savedQueries.getSavedQuery(savedQueryId).then(savedQuery => {
$scope.$evalAsync(() => {
$scope.updateSavedQuery(savedQuery);
});
@@ -622,7 +615,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
if (id) {
toastNotifications.addSuccess({
title: i18n.translate(
- 'kbn.visualize.topNavMenu.saveVisualization.successNotificationText',
+ 'visualize.topNavMenu.saveVisualization.successNotificationText',
{
defaultMessage: `Saved '{visTitle}'`,
values: {
@@ -661,15 +654,12 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
// eslint-disable-next-line
console.error(error);
toastNotifications.addDanger({
- title: i18n.translate(
- 'kbn.visualize.topNavMenu.saveVisualization.failureNotificationText',
- {
- defaultMessage: `Error on saving '{visTitle}'`,
- values: {
- visTitle: savedVis.title,
- },
- }
- ),
+ title: i18n.translate('visualize.topNavMenu.saveVisualization.failureNotificationText', {
+ defaultMessage: `Error on saving '{visTitle}'`,
+ values: {
+ visTitle: savedVis.title,
+ },
+ }),
text: error.message,
'data-test-subj': 'saveVisualizationError',
});
@@ -692,7 +682,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
});
toastNotifications.addSuccess(
- i18n.translate('kbn.visualize.linkedToSearch.unlinkSuccessNotificationText', {
+ i18n.translate('visualize.linkedToSearch.unlinkSuccessNotificationText', {
defaultMessage: `Unlinked from saved search '{searchTitle}'`,
values: {
searchTitle: savedSearch.title,
@@ -704,7 +694,7 @@ function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlState
$scope.getAdditionalMessage = () => {
return (
'' +
- i18n.translate('kbn.visualize.experimentalVisInfoText', {
+ i18n.translate('visualize.experimentalVisInfoText', {
defaultMessage: 'This visualization is marked as experimental.',
}) +
' ' +
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/index.ts b/src/plugins/visualize/public/application/editor/lib/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/index.ts
rename to src/plugins/visualize/public/application/editor/lib/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/make_stateful.ts b/src/plugins/visualize/public/application/editor/lib/make_stateful.ts
similarity index 91%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/make_stateful.ts
rename to src/plugins/visualize/public/application/editor/lib/make_stateful.ts
index 8384585108a59..d071df314d99c 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/make_stateful.ts
+++ b/src/plugins/visualize/public/application/editor/lib/make_stateful.ts
@@ -17,8 +17,8 @@
* under the License.
*/
-import { PersistedState } from '../../../../../../../../plugins/visualizations/public';
-import { ReduxLikeStateContainer } from '../../../../../../../../plugins/kibana_utils/public';
+import { PersistedState } from '../../../../../visualizations/public';
+import { ReduxLikeStateContainer } from '../../../../../kibana_utils/public';
import { VisualizeAppState, VisualizeAppStateTransitions } from '../../types';
/**
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/migrate_app_state.ts b/src/plugins/visualize/public/application/editor/lib/migrate_app_state.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/migrate_app_state.ts
rename to src/plugins/visualize/public/application/editor/lib/migrate_app_state.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/url_helper.test.ts b/src/plugins/visualize/public/application/editor/lib/url_helper.test.ts
similarity index 88%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/url_helper.test.ts
rename to src/plugins/visualize/public/application/editor/lib/url_helper.test.ts
index e6974af9af832..09609e3d7e362 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/url_helper.test.ts
+++ b/src/plugins/visualize/public/application/editor/lib/url_helper.test.ts
@@ -19,15 +19,6 @@
import { addEmbeddableToDashboardUrl } from './url_helper';
-jest.mock('../../../legacy_imports', () => ({
- DashboardConstants: {
- ADD_EMBEDDABLE_ID: 'addEmbeddableId',
- ADD_EMBEDDABLE_TYPE: 'addEmbeddableType',
- CREATE_NEW_DASHBOARD_URL: '/dashboard',
- },
- VISUALIZE_EMBEDDABLE_TYPE: 'visualization',
-}));
-
describe('', () => {
it('addEmbeddableToDashboardUrl when dashboard is not saved', () => {
const id = '123eb456cd';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/url_helper.ts b/src/plugins/visualize/public/application/editor/lib/url_helper.ts
similarity index 92%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/url_helper.ts
rename to src/plugins/visualize/public/application/editor/lib/url_helper.ts
index c7937c856184a..84e1ef9687cd0 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/url_helper.ts
+++ b/src/plugins/visualize/public/application/editor/lib/url_helper.ts
@@ -18,7 +18,8 @@
*/
import { parseUrl, stringify } from 'query-string';
-import { DashboardConstants, VISUALIZE_EMBEDDABLE_TYPE } from '../../../legacy_imports';
+import { DashboardConstants } from '../../../../../dashboard/public';
+import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../visualizations/public';
/** *
* Returns relative dashboard URL with added embeddableType and embeddableId query params
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/visualize_app_state.ts b/src/plugins/visualize/public/application/editor/lib/visualize_app_state.ts
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/visualize_app_state.ts
rename to src/plugins/visualize/public/application/editor/lib/visualize_app_state.ts
index 86f39ea76dd3a..fe2a19b7315c3 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/visualize_app_state.ts
+++ b/src/plugins/visualize/public/application/editor/lib/visualize_app_state.ts
@@ -24,7 +24,7 @@ import {
createStateContainer,
syncState,
IKbnUrlStateStorage,
-} from '../../../../../../../../plugins/kibana_utils/public';
+} from '../../../../../kibana_utils/public';
import { PureVisState, VisualizeAppState, VisualizeAppStateTransitions } from '../../types';
const STATE_STORAGE_KEY = '_a';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization.js b/src/plugins/visualize/public/application/editor/visualization.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization.js
rename to src/plugins/visualize/public/application/editor/visualization.js
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization_editor.js b/src/plugins/visualize/public/application/editor/visualization_editor.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization_editor.js
rename to src/plugins/visualize/public/application/editor/visualization_editor.js
index ef174dbaa5865..874b69532ec11 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization_editor.js
+++ b/src/plugins/visualize/public/application/editor/visualization_editor.js
@@ -44,7 +44,6 @@ export function initVisEditorDirective(app, deps) {
editor.render({
core: deps.core,
data: deps.data,
- embeddable: deps.embeddable,
uiState: $scope.uiState,
timeRange: $scope.timeRange,
filters: $scope.filters,
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/help_menu/help_menu_util.js b/src/plugins/visualize/public/application/help_menu/help_menu_util.js
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/help_menu/help_menu_util.js
rename to src/plugins/visualize/public/application/help_menu/help_menu_util.js
index 9c00947d7663c..c297326f2e264 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/help_menu/help_menu_util.js
+++ b/src/plugins/visualize/public/application/help_menu/help_menu_util.js
@@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n';
export function addHelpMenuToAppChrome(chrome, docLinks) {
chrome.setHelpExtension({
- appName: i18n.translate('kbn.visualize.helpMenu.appName', {
+ appName: i18n.translate('visualize.helpMenu.appName', {
defaultMessage: 'Visualize',
}),
links: [
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/_index.scss b/src/plugins/visualize/public/application/index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/_index.scss
rename to src/plugins/visualize/public/application/index.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js b/src/plugins/visualize/public/application/legacy_app.js
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
rename to src/plugins/visualize/public/application/legacy_app.js
index a710d3e318749..7c5e3ce9408f0 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
+++ b/src/plugins/visualize/public/application/legacy_app.js
@@ -25,7 +25,8 @@ import {
createKbnUrlStateStorage,
redirectWhenMissing,
ensureDefaultIndexPattern,
-} from '../../../../../../plugins/kibana_utils/public';
+} from '../../../kibana_utils/public';
+import { createSavedSearchesLoader } from '../../../discover/public';
import editorTemplate from './editor/editor.html';
import visualizeListingTemplate from './listing/visualize_listing.html';
@@ -40,7 +41,6 @@ import {
getCreateBreadcrumbs,
getEditBreadcrumbs,
} from './breadcrumbs';
-import { createSavedSearchesLoader } from '../../../../../../plugins/discover/public';
const getResolvedResults = deps => {
const { core, data, visualizations, createVisEmbeddableFromObject } = deps;
@@ -93,7 +93,7 @@ export function initVisualizeApp(app, deps) {
app.factory('kbnUrlStateStorage', history =>
createKbnUrlStateStorage({
history,
- useHash: deps.uiSettings.get('state:storeInSessionStorage'),
+ useHash: deps.core.uiSettings.get('state:storeInSessionStorage'),
})
);
@@ -107,10 +107,10 @@ export function initVisualizeApp(app, deps) {
}
return {
- text: i18n.translate('kbn.visualize.badge.readOnly.text', {
+ text: i18n.translate('visualize.badge.readOnly.text', {
defaultMessage: 'Read only',
}),
- tooltip: i18n.translate('kbn.visualize.badge.readOnly.tooltip', {
+ tooltip: i18n.translate('visualize.badge.readOnly.tooltip', {
defaultMessage: 'Unable to save visualizations',
}),
iconType: 'glasses',
@@ -156,7 +156,7 @@ export function initVisualizeApp(app, deps) {
if (shouldHaveIndex && !hasIndex) {
throw new Error(
i18n.translate(
- 'kbn.visualize.createVisualization.noIndexPatternOrSavedSearchIdErrorMessage',
+ 'visualize.createVisualization.noIndexPatternOrSavedSearchIdErrorMessage',
{
defaultMessage: 'You must provide either an indexPattern or a savedSearchId',
}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_index.scss b/src/plugins/visualize/public/application/listing/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_index.scss
rename to src/plugins/visualize/public/application/listing/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_listing.scss b/src/plugins/visualize/public/application/listing/_listing.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_listing.scss
rename to src/plugins/visualize/public/application/listing/_listing.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.html b/src/plugins/visualize/public/application/listing/visualize_listing.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.html
rename to src/plugins/visualize/public/application/listing/visualize_listing.html
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js b/src/plugins/visualize/public/application/listing/visualize_listing.js
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js
rename to src/plugins/visualize/public/application/listing/visualize_listing.js
index 098633d046062..900c17fa394de 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js
+++ b/src/plugins/visualize/public/application/listing/visualize_listing.js
@@ -24,7 +24,7 @@ import { VisualizeConstants } from '../visualize_constants';
import { i18n } from '@kbn/i18n';
import { getServices } from '../../kibana_services';
-import { syncQueryStateWithUrl } from '../../../../../../../plugins/data/public';
+import { syncQueryStateWithUrl } from '../../../../data/public';
export function initListingDirective(app, I18nContext) {
app.directive('visualizeListingTable', reactDirective =>
@@ -40,9 +40,8 @@ export function VisualizeListingController($scope, createNewVis, kbnUrlStateStor
savedVisualizations,
data: { query },
toastNotifications,
- uiSettings,
visualizations,
- core: { docLinks, savedObjects },
+ core: { docLinks, savedObjects, uiSettings },
} = getServices();
// syncs `_g` portion of url with query services
@@ -110,7 +109,7 @@ export function VisualizeListingController($scope, createNewVis, kbnUrlStateStor
})
).catch(error => {
toastNotifications.addError(error, {
- title: i18n.translate('kbn.visualize.visualizeListingDeleteErrorTitle', {
+ title: i18n.translate('visualize.visualizeListingDeleteErrorTitle', {
defaultMessage: 'Error deleting visualization',
}),
});
@@ -119,7 +118,7 @@ export function VisualizeListingController($scope, createNewVis, kbnUrlStateStor
chrome.setBreadcrumbs([
{
- text: i18n.translate('kbn.visualize.visualizeListingBreadcrumbsTitle', {
+ text: i18n.translate('visualize.visualizeListingBreadcrumbsTitle', {
defaultMessage: 'Visualize',
}),
},
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing_table.js b/src/plugins/visualize/public/application/listing/visualize_listing_table.js
similarity index 83%
rename from src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing_table.js
rename to src/plugins/visualize/public/application/listing/visualize_listing_table.js
index 932ac8996e97e..100becdd3a80f 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing_table.js
+++ b/src/plugins/visualize/public/application/listing/visualize_listing_table.js
@@ -21,7 +21,7 @@ import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
-import { TableListView } from '../../../../../../../plugins/kibana_react/public';
+import { TableListView } from '../../../../kibana_react/public';
import { EuiIcon, EuiBetaBadge, EuiLink, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
@@ -33,7 +33,7 @@ class VisualizeListingTable extends Component {
}
render() {
- const { visualizeCapabilities, uiSettings, toastNotifications } = getServices();
+ const { visualizeCapabilities, core, toastNotifications } = getServices();
return (
item.canDelete}
initialFilter={''}
noItemsFragment={this.getNoItemsMessage()}
- entityName={i18n.translate('kbn.visualize.listing.table.entityName', {
+ entityName={i18n.translate('visualize.listing.table.entityName', {
defaultMessage: 'visualization',
})}
- entityNamePlural={i18n.translate('kbn.visualize.listing.table.entityNamePlural', {
+ entityNamePlural={i18n.translate('visualize.listing.table.entityNamePlural', {
defaultMessage: 'visualizations',
})}
- tableListTitle={i18n.translate('kbn.visualize.listing.table.listTitle', {
+ tableListTitle={i18n.translate('visualize.listing.table.listTitle', {
defaultMessage: 'Visualizations',
})}
toastNotifications={toastNotifications}
- uiSettings={uiSettings}
+ uiSettings={core.uiSettings}
/>
);
}
@@ -67,7 +67,7 @@ class VisualizeListingTable extends Component {
const tableColumns = [
{
field: 'title',
- name: i18n.translate('kbn.visualize.listing.table.titleColumnName', {
+ name: i18n.translate('visualize.listing.table.titleColumnName', {
defaultMessage: 'Title',
}),
sortable: true,
@@ -82,7 +82,7 @@ class VisualizeListingTable extends Component {
},
{
field: 'typeTitle',
- name: i18n.translate('kbn.visualize.listing.table.typeColumnName', {
+ name: i18n.translate('visualize.listing.table.typeColumnName', {
defaultMessage: 'Type',
}),
sortable: true,
@@ -96,7 +96,7 @@ class VisualizeListingTable extends Component {
},
{
field: 'description',
- name: i18n.translate('kbn.dashboard.listing.table.descriptionColumnName', {
+ name: i18n.translate('visualize.listing.table.descriptionColumnName', {
defaultMessage: 'Description',
}),
sortable: true,
@@ -116,7 +116,7 @@ class VisualizeListingTable extends Component {
title={
@@ -133,7 +133,7 @@ class VisualizeListingTable extends Component {
title={
@@ -142,7 +142,7 @@ class VisualizeListingTable extends Component {
@@ -156,7 +156,7 @@ class VisualizeListingTable extends Component {
data-test-subj="createVisualizationPromptButton"
>
@@ -192,10 +192,10 @@ class VisualizeListingTable extends Component {
{
return new VisualizePlugin(context);
};
diff --git a/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts b/src/plugins/visualize/public/kibana_services.ts
similarity index 68%
rename from src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts
rename to src/plugins/visualize/public/kibana_services.ts
index d5440c4677d8a..765e9a82ae899 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts
+++ b/src/plugins/visualize/public/kibana_services.ts
@@ -22,21 +22,18 @@ import {
CoreStart,
SavedObjectsClientContract,
ToastsStart,
- IUiSettingsClient,
- I18nStart,
PluginInitializerContext,
+ I18nStart,
} from 'kibana/public';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
-import { Storage } from '../../../../../plugins/kibana_utils/public';
-import { EmbeddableStart } from '../../../../../plugins/embeddable/public';
-import { SharePluginStart } from '../../../../../plugins/share/public';
-import { DataPublicPluginStart, IndexPatternsContract } from '../../../../../plugins/data/public';
-import { VisualizationsStart } from '../../../../../plugins/visualizations/public';
-import { SavedVisualizations } from './np_ready/types';
-import { UsageCollectionSetup } from '../../../../../plugins/usage_collection/public';
-import { KibanaLegacyStart } from '../../../../../plugins/kibana_legacy/public';
-import { DefaultEditorController } from '../../../../../plugins/vis_default_editor/public';
+import { NavigationPublicPluginStart as NavigationStart } from '../../navigation/public';
+import { Storage } from '../../kibana_utils/public';
+import { SharePluginStart } from '../../share/public';
+import { DataPublicPluginStart } from '../../data/public';
+import { VisualizationsStart } from '../../visualizations/public';
+import { SavedVisualizations } from './application/types';
+import { KibanaLegacyStart } from '../../kibana_legacy/public';
+import { DefaultEditorController } from '../../vis_default_editor/public';
export interface VisualizeKibanaServices {
pluginInitializerContext: PluginInitializerContext;
@@ -44,20 +41,15 @@ export interface VisualizeKibanaServices {
chrome: ChromeStart;
core: CoreStart;
data: DataPublicPluginStart;
- embeddable: EmbeddableStart;
- indexPatterns: IndexPatternsContract;
localStorage: Storage;
navigation: NavigationStart;
toastNotifications: ToastsStart;
savedObjectsClient: SavedObjectsClientContract;
- savedQueryService: DataPublicPluginStart['query']['savedQueries'];
savedVisualizations: SavedVisualizations;
- share: SharePluginStart;
- uiSettings: IUiSettingsClient;
+ share?: SharePluginStart;
config: KibanaLegacyStart['config'];
visualizeCapabilities: any;
visualizations: VisualizationsStart;
- usageCollection?: UsageCollectionSetup;
I18nContext: I18nStart['Context'];
setActiveUrl: (newUrl: string) => void;
DefaultVisualizationEditor: typeof DefaultEditorController;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/plugin.ts b/src/plugins/visualize/public/plugin.ts
similarity index 53%
rename from src/legacy/core_plugins/kibana/public/visualize/plugin.ts
rename to src/plugins/visualize/public/plugin.ts
index 4ffbc307c69a8..ab64e083a553d 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/plugin.ts
+++ b/src/plugins/visualize/public/plugin.ts
@@ -27,64 +27,43 @@ import {
CoreStart,
Plugin,
PluginInitializerContext,
- SavedObjectsClientContract,
} from 'kibana/public';
-import { Storage, createKbnUrlTracker } from '../../../../../plugins/kibana_utils/public';
-import {
- DataPublicPluginStart,
- DataPublicPluginSetup,
- esFilters,
-} from '../../../../../plugins/data/public';
-import { EmbeddableStart } from '../../../../../plugins/embeddable/public';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
-import { SharePluginStart } from '../../../../../plugins/share/public';
-import {
- KibanaLegacySetup,
- AngularRenderedAppUpdater,
-} from '../../../../../plugins/kibana_legacy/public';
-import { VisualizationsStart } from '../../../../../plugins/visualizations/public';
-import { VisualizeConstants } from './np_ready/visualize_constants';
+import { Storage, createKbnUrlTracker } from '../../kibana_utils/public';
+import { DataPublicPluginStart, DataPublicPluginSetup, esFilters } from '../../data/public';
+import { NavigationPublicPluginStart as NavigationStart } from '../../navigation/public';
+import { SharePluginStart } from '../../share/public';
+import { KibanaLegacySetup, AngularRenderedAppUpdater } from '../../kibana_legacy/public';
+import { VisualizationsStart } from '../../visualizations/public';
+import { VisualizeConstants } from './application/visualize_constants';
import { setServices, VisualizeKibanaServices } from './kibana_services';
-import {
- FeatureCatalogueCategory,
- HomePublicPluginSetup,
-} from '../../../../../plugins/home/public';
-import { UsageCollectionSetup } from '../../../../../plugins/usage_collection/public';
-import { DefaultEditorController } from '../../../../../plugins/vis_default_editor/public';
+import { FeatureCatalogueCategory, HomePublicPluginSetup } from '../../home/public';
+import { DefaultEditorController } from '../../vis_default_editor/public';
export interface VisualizePluginStartDependencies {
data: DataPublicPluginStart;
- embeddable: EmbeddableStart;
navigation: NavigationStart;
- share: SharePluginStart;
+ share?: SharePluginStart;
visualizations: VisualizationsStart;
}
export interface VisualizePluginSetupDependencies {
- home: HomePublicPluginSetup;
+ home?: HomePublicPluginSetup;
kibanaLegacy: KibanaLegacySetup;
- usageCollection?: UsageCollectionSetup;
data: DataPublicPluginSetup;
}
-export class VisualizePlugin implements Plugin {
- private startDependencies: {
- data: DataPublicPluginStart;
- embeddable: EmbeddableStart;
- navigation: NavigationStart;
- savedObjectsClient: SavedObjectsClientContract;
- share: SharePluginStart;
- visualizations: VisualizationsStart;
- } | null = null;
+export class VisualizePlugin
+ implements
+ Plugin {
private appStateUpdater = new BehaviorSubject(() => ({}));
private stopUrlTracking: (() => void) | undefined = undefined;
constructor(private initializerContext: PluginInitializerContext) {}
public async setup(
- core: CoreSetup,
- { home, kibanaLegacy, usageCollection, data }: VisualizePluginSetupDependencies
+ core: CoreSetup,
+ { home, kibanaLegacy, data }: VisualizePluginSetupDependencies
) {
const { appMounted, appUnMounted, stop: stopUrlTracker, setActiveUrl } = createKbnUrlTracker({
baseUrl: core.http.basePath.prepend('/app/kibana'),
@@ -117,50 +96,34 @@ export class VisualizePlugin implements Plugin {
updater$: this.appStateUpdater.asObservable(),
navLinkId: 'kibana:visualize',
mount: async (params: AppMountParameters) => {
- const [coreStart] = await core.getStartServices();
-
- if (this.startDependencies === null) {
- throw new Error('not started yet');
- }
+ const [coreStart, pluginsStart] = await core.getStartServices();
appMounted();
- const {
- savedObjectsClient,
- embeddable,
- navigation,
- visualizations,
- data: dataStart,
- share,
- } = this.startDependencies;
const deps: VisualizeKibanaServices = {
pluginInitializerContext: this.initializerContext,
addBasePath: coreStart.http.basePath.prepend,
core: coreStart,
+ config: kibanaLegacy.config,
chrome: coreStart.chrome,
- data: dataStart,
- embeddable,
- indexPatterns: dataStart.indexPatterns,
+ data: pluginsStart.data,
localStorage: new Storage(localStorage),
- navigation,
- savedObjectsClient,
- savedVisualizations: visualizations.savedVisualizationsLoader,
- savedQueryService: dataStart.query.savedQueries,
- share,
+ navigation: pluginsStart.navigation,
+ savedObjectsClient: coreStart.savedObjects.client,
+ savedVisualizations: pluginsStart.visualizations.savedVisualizationsLoader,
+ share: pluginsStart.share,
toastNotifications: coreStart.notifications.toasts,
- uiSettings: coreStart.uiSettings,
- config: kibanaLegacy.config,
visualizeCapabilities: coreStart.application.capabilities.visualize,
- visualizations,
- usageCollection,
+ visualizations: pluginsStart.visualizations,
I18nContext: coreStart.i18n.Context,
setActiveUrl,
DefaultVisualizationEditor: DefaultEditorController,
- createVisEmbeddableFromObject: visualizations.__LEGACY.createVisEmbeddableFromObject,
+ createVisEmbeddableFromObject:
+ pluginsStart.visualizations.__LEGACY.createVisEmbeddableFromObject,
};
setServices(deps);
- const { renderApp } = await import('./np_ready/application');
+ const { renderApp } = await import('./application/application');
const unmount = renderApp(params.element, params.appBasePath, deps);
return () => {
unmount();
@@ -169,33 +132,23 @@ export class VisualizePlugin implements Plugin {
},
});
- home.featureCatalogue.register({
- id: 'visualize',
- title: 'Visualize',
- description: i18n.translate('kbn.visualize.visualizeDescription', {
- defaultMessage:
- 'Create visualizations and aggregate data stores in your Elasticsearch indices.',
- }),
- icon: 'visualizeApp',
- path: `/app/kibana#${VisualizeConstants.LANDING_PAGE_PATH}`,
- showOnHomePage: true,
- category: FeatureCatalogueCategory.DATA,
- });
+ if (home) {
+ home.featureCatalogue.register({
+ id: 'visualize',
+ title: 'Visualize',
+ description: i18n.translate('visualize.visualizeDescription', {
+ defaultMessage:
+ 'Create visualizations and aggregate data stores in your Elasticsearch indices.',
+ }),
+ icon: 'visualizeApp',
+ path: `/app/kibana#${VisualizeConstants.LANDING_PAGE_PATH}`,
+ showOnHomePage: true,
+ category: FeatureCatalogueCategory.DATA,
+ });
+ }
}
- public start(
- core: CoreStart,
- { embeddable, navigation, data, share, visualizations }: VisualizePluginStartDependencies
- ) {
- this.startDependencies = {
- data,
- embeddable,
- navigation,
- savedObjectsClient: core.savedObjects.client,
- share,
- visualizations,
- };
- }
+ public start(core: CoreStart, plugins: VisualizePluginStartDependencies) {}
stop() {
if (this.stopUrlTracking) {
diff --git a/tasks/config/peg.js b/tasks/config/peg.js
index 1d8667840faba..2de6ff4b5cff9 100644
--- a/tasks/config/peg.js
+++ b/tasks/config/peg.js
@@ -26,7 +26,7 @@ module.exports = {
},
},
timelion_chain: {
- src: 'src/legacy/core_plugins/vis_type_timelion/public/chain.peg',
- dest: 'src/legacy/core_plugins/vis_type_timelion/public/_generated_/chain.js',
+ src: 'src/plugins/vis_type_timelion/public/chain.peg',
+ dest: 'src/plugins/vis_type_timelion/public/_generated_/chain.js',
},
};
diff --git a/test/api_integration/apis/saved_objects/migrations.js b/test/api_integration/apis/saved_objects/migrations.js
index bd207ccb41b20..9d908b95ca575 100644
--- a/test/api_integration/apis/saved_objects/migrations.js
+++ b/test/api_integration/apis/saved_objects/migrations.js
@@ -383,7 +383,7 @@ function migrationsToTypes(migrations) {
return Object.entries(migrations).map(([type, migrations]) => ({
name: type,
hidden: false,
- namespaceAgnostic: false,
+ namespaceType: 'single',
mappings: { properties: {} },
migrations: { ...migrations },
}));
diff --git a/test/functional/apps/dashboard/create_and_add_embeddables.js b/test/functional/apps/dashboard/create_and_add_embeddables.js
index 3ce8e353e61fc..410acdcb5680d 100644
--- a/test/functional/apps/dashboard/create_and_add_embeddables.js
+++ b/test/functional/apps/dashboard/create_and_add_embeddables.js
@@ -19,7 +19,7 @@
import expect from '@kbn/expect';
-import { VisualizeConstants } from '../../../../src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants';
+import { VisualizeConstants } from '../../../../src/plugins/visualize/public/application/visualize_constants';
export default function({ getService, getPageObjects }) {
const retry = getService('retry');
diff --git a/test/functional/apps/dashboard/panel_controls.js b/test/functional/apps/dashboard/panel_controls.js
index f30f58913bd97..6e24b9f3570a3 100644
--- a/test/functional/apps/dashboard/panel_controls.js
+++ b/test/functional/apps/dashboard/panel_controls.js
@@ -24,7 +24,7 @@ import {
AREA_CHART_VIS_NAME,
LINE_CHART_VIS_NAME,
} from '../../page_objects/dashboard_page';
-import { VisualizeConstants } from '../../../../src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants';
+import { VisualizeConstants } from '../../../../src/plugins/visualize/public/application/visualize_constants';
export default function({ getService, getPageObjects }) {
const browser = getService('browser');
@@ -113,6 +113,50 @@ export default function({ getService, getPageObjects }) {
});
});
+ describe('panel cloning', function() {
+ before(async () => {
+ await PageObjects.dashboard.clickNewDashboard();
+ await PageObjects.timePicker.setHistoricalDataRange();
+ await dashboardAddPanel.addVisualization(PIE_CHART_VIS_NAME);
+ });
+
+ after(async function() {
+ await PageObjects.dashboard.gotoDashboardLandingPage();
+ });
+
+ it('clones a panel', async () => {
+ const initialPanelTitles = await PageObjects.dashboard.getPanelTitles();
+ await dashboardPanelActions.clonePanelByTitle(PIE_CHART_VIS_NAME);
+ await PageObjects.header.waitUntilLoadingHasFinished();
+ await PageObjects.dashboard.waitForRenderComplete();
+ const postPanelTitles = await PageObjects.dashboard.getPanelTitles();
+ expect(postPanelTitles.length).to.equal(initialPanelTitles.length + 1);
+ });
+
+ it('appends a clone title tag', async () => {
+ const panelTitles = await PageObjects.dashboard.getPanelTitles();
+ expect(panelTitles[1]).to.equal(PIE_CHART_VIS_NAME + ' (copy)');
+ });
+
+ it('retains original panel dimensions', async () => {
+ const panelDimensions = await PageObjects.dashboard.getPanelDimensions();
+ expect(panelDimensions[0]).to.eql(panelDimensions[1]);
+ });
+
+ it('gives a correct title to the clone of a clone', async () => {
+ const initialPanelTitles = await PageObjects.dashboard.getPanelTitles();
+ const clonedPanelName = initialPanelTitles[initialPanelTitles.length - 1];
+ await dashboardPanelActions.clonePanelByTitle(clonedPanelName);
+ await PageObjects.header.waitUntilLoadingHasFinished();
+ await PageObjects.dashboard.waitForRenderComplete();
+ const postPanelTitles = await PageObjects.dashboard.getPanelTitles();
+ expect(postPanelTitles.length).to.equal(initialPanelTitles.length + 1);
+ expect(postPanelTitles[postPanelTitles.length - 1]).to.equal(
+ PIE_CHART_VIS_NAME + ' (copy 1)'
+ );
+ });
+ });
+
describe('panel edit controls', function() {
before(async () => {
await PageObjects.dashboard.clickNewDashboard();
@@ -137,6 +181,7 @@ export default function({ getService, getPageObjects }) {
await dashboardPanelActions.expectExistsEditPanelAction();
await dashboardPanelActions.expectExistsReplacePanelAction();
+ await dashboardPanelActions.expectExistsDuplicatePanelAction();
await dashboardPanelActions.expectExistsRemovePanelAction();
});
@@ -151,6 +196,7 @@ export default function({ getService, getPageObjects }) {
await dashboardPanelActions.openContextMenu();
await dashboardPanelActions.expectExistsEditPanelAction();
await dashboardPanelActions.expectExistsReplacePanelAction();
+ await dashboardPanelActions.expectExistsDuplicatePanelAction();
await dashboardPanelActions.expectExistsRemovePanelAction();
// Get rid of the timestamp in the url.
@@ -166,6 +212,7 @@ export default function({ getService, getPageObjects }) {
await dashboardPanelActions.openContextMenu();
await dashboardPanelActions.expectMissingEditPanelAction();
await dashboardPanelActions.expectMissingReplacePanelAction();
+ await dashboardPanelActions.expectMissingDuplicatePanelAction();
await dashboardPanelActions.expectMissingRemovePanelAction();
});
@@ -174,6 +221,7 @@ export default function({ getService, getPageObjects }) {
await dashboardPanelActions.openContextMenu();
await dashboardPanelActions.expectExistsEditPanelAction();
await dashboardPanelActions.expectExistsReplacePanelAction();
+ await dashboardPanelActions.expectExistsDuplicatePanelAction();
await dashboardPanelActions.expectMissingRemovePanelAction();
await dashboardPanelActions.clickExpandPanelToggle();
});
diff --git a/test/functional/config.edge.js b/test/functional/config.edge.js
new file mode 100644
index 0000000000000..ed68b41e8c89a
--- /dev/null
+++ b/test/functional/config.edge.js
@@ -0,0 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export default async function({ readConfigFile }) {
+ const defaultConfig = await readConfigFile(require.resolve('./config'));
+
+ return {
+ ...defaultConfig.getAll(),
+
+ browser: {
+ type: 'msedge',
+ },
+
+ junit: {
+ reportName: 'MS Chromium Edge UI Functional Tests',
+ },
+ };
+}
diff --git a/test/functional/page_objects/visualize_page.ts b/test/functional/page_objects/visualize_page.ts
index 3b63fa68d71ee..220c2d8f6b363 100644
--- a/test/functional/page_objects/visualize_page.ts
+++ b/test/functional/page_objects/visualize_page.ts
@@ -18,7 +18,7 @@
*/
import { FtrProviderContext } from '../ftr_provider_context';
-import { VisualizeConstants } from '../../../src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants';
+import { VisualizeConstants } from '../../../src/plugins/visualize/public/application/visualize_constants';
export function VisualizePageProvider({ getService, getPageObjects }: FtrProviderContext) {
const testSubjects = getService('testSubjects');
diff --git a/test/functional/services/browser.ts b/test/functional/services/browser.ts
index 5017947e95d03..13d2365c07191 100644
--- a/test/functional/services/browser.ts
+++ b/test/functional/services/browser.ts
@@ -47,7 +47,9 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
*/
public readonly browserType: string = browserType;
- public readonly isChrome: boolean = browserType === Browsers.Chrome;
+ public readonly isChromium: boolean = [Browsers.Chrome, Browsers.ChromiumEdge].includes(
+ browserType
+ );
public readonly isFirefox: boolean = browserType === Browsers.Firefox;
diff --git a/test/functional/services/dashboard/panel_actions.js b/test/functional/services/dashboard/panel_actions.js
index baea2a52208c1..b155d747f3b93 100644
--- a/test/functional/services/dashboard/panel_actions.js
+++ b/test/functional/services/dashboard/panel_actions.js
@@ -20,6 +20,7 @@
const REMOVE_PANEL_DATA_TEST_SUBJ = 'embeddablePanelAction-deletePanel';
const EDIT_PANEL_DATA_TEST_SUBJ = 'embeddablePanelAction-editPanel';
const REPLACE_PANEL_DATA_TEST_SUBJ = 'embeddablePanelAction-replacePanel';
+const CLONE_PANEL_DATA_TEST_SUBJ = 'embeddablePanelAction-clonePanel';
const TOGGLE_EXPAND_PANEL_DATA_TEST_SUBJ = 'embeddablePanelAction-togglePanel';
const CUSTOMIZE_PANEL_DATA_TEST_SUBJ = 'embeddablePanelAction-ACTION_CUSTOMIZE_PANEL';
const OPEN_CONTEXT_MENU_ICON_DATA_TEST_SUBJ = 'embeddablePanelToggleMenuIcon';
@@ -97,6 +98,16 @@ export function DashboardPanelActionsProvider({ getService, getPageObjects }) {
await testSubjects.click(REPLACE_PANEL_DATA_TEST_SUBJ);
}
+ async clonePanelByTitle(title) {
+ log.debug(`clonePanel(${title})`);
+ let panelOptions = null;
+ if (title) {
+ panelOptions = await this.getPanelHeading(title);
+ }
+ await this.openContextMenu(panelOptions);
+ await testSubjects.click(CLONE_PANEL_DATA_TEST_SUBJ);
+ }
+
async openInspectorByTitle(title) {
const header = await this.getPanelHeading(title);
await this.openInspector(header);
@@ -123,7 +134,12 @@ export function DashboardPanelActionsProvider({ getService, getPageObjects }) {
}
async expectExistsReplacePanelAction() {
- log.debug('expectExistsEditPanelAction');
+ log.debug('expectExistsReplacePanelAction');
+ await testSubjects.existOrFail(REPLACE_PANEL_DATA_TEST_SUBJ);
+ }
+
+ async expectExistsDuplicatePanelAction() {
+ log.debug('expectExistsDuplicatePanelAction');
await testSubjects.existOrFail(REPLACE_PANEL_DATA_TEST_SUBJ);
}
@@ -133,7 +149,12 @@ export function DashboardPanelActionsProvider({ getService, getPageObjects }) {
}
async expectMissingReplacePanelAction() {
- log.debug('expectMissingEditPanelAction');
+ log.debug('expectMissingReplacePanelAction');
+ await testSubjects.missingOrFail(REPLACE_PANEL_DATA_TEST_SUBJ);
+ }
+
+ async expectMissingDuplicatePanelAction() {
+ log.debug('expectMissingDuplicatePanelAction');
await testSubjects.missingOrFail(REPLACE_PANEL_DATA_TEST_SUBJ);
}
diff --git a/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts b/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
index 157918df874c8..8b57ecd3c8235 100644
--- a/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
+++ b/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
@@ -55,6 +55,7 @@ export class WebElementWrapper {
private driver: WebDriver = this.webDriver.driver;
private Keys = Key;
public isW3CEnabled: boolean = (this.webDriver.driver as any).executor_.w3c === true;
+ public isChromium: boolean = [Browsers.Chrome, Browsers.ChromiumEdge].includes(this.browserType);
public static create(
webElement: WebElement | WebElementWrapper,
@@ -63,7 +64,7 @@ export class WebElementWrapper {
timeout: number,
fixedHeaderHeight: number,
logger: ToolingLog,
- browserType: string
+ browserType: Browsers
): WebElementWrapper {
if (webElement instanceof WebElementWrapper) {
return webElement;
@@ -87,7 +88,7 @@ export class WebElementWrapper {
private timeout: number,
private fixedHeaderHeight: number,
private logger: ToolingLog,
- private browserType: string
+ private browserType: Browsers
) {}
private async _findWithCustomTimeout(
@@ -243,7 +244,7 @@ export class WebElementWrapper {
return this.clearValueWithKeyboard();
}
await this.retryCall(async function clearValue(wrapper) {
- if (wrapper.browserType === Browsers.Chrome || options.withJS) {
+ if (wrapper.isChromium || options.withJS) {
// https://bugs.chromium.org/p/chromedriver/issues/detail?id=2702
await wrapper.driver.executeScript(`arguments[0].value=''`, wrapper._webElement);
} else {
@@ -275,7 +276,7 @@ export class WebElementWrapper {
await delay(100);
}
} else {
- if (this.browserType === Browsers.Chrome) {
+ if (this.isChromium) {
// https://bugs.chromium.org/p/chromedriver/issues/detail?id=30
await this.retryCall(async function clearValueWithKeyboard(wrapper) {
await wrapper.driver.executeScript(`arguments[0].select();`, wrapper._webElement);
diff --git a/test/functional/services/remote/browsers.ts b/test/functional/services/remote/browsers.ts
index 46d81f1737a55..aa6e364d0a09d 100644
--- a/test/functional/services/remote/browsers.ts
+++ b/test/functional/services/remote/browsers.ts
@@ -21,4 +21,5 @@ export enum Browsers {
Chrome = 'chrome',
Firefox = 'firefox',
InternetExplorer = 'ie',
+ ChromiumEdge = 'msedge',
}
diff --git a/test/functional/services/remote/remote.ts b/test/functional/services/remote/remote.ts
index e571a1a7e5551..933b08f7681e8 100644
--- a/test/functional/services/remote/remote.ts
+++ b/test/functional/services/remote/remote.ts
@@ -69,13 +69,15 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
const caps = await driver.getCapabilities();
const browserVersion = caps.get(isW3CEnabled ? 'browserVersion' : 'version');
- log.info(`Remote initialized: ${caps.get('browserName')} ${browserVersion}`);
+ log.info(
+ `Remote initialized: ${caps.get(
+ 'browserName'
+ )} ${browserVersion}, w3c compliance=${isW3CEnabled}, collectingCoverage=${collectCoverage}`
+ );
- if (browserType === Browsers.Chrome) {
+ if ([Browsers.Chrome, Browsers.ChromiumEdge].includes(browserType)) {
log.info(
- `Chromedriver version: ${
- caps.get('chrome').chromedriverVersion
- }, w3c=${isW3CEnabled}, codeCoverage=${collectCoverage}`
+ `${browserType}driver version: ${caps.get(browserType)[`${browserType}driverVersion`]}`
);
}
diff --git a/test/functional/services/remote/webdriver.ts b/test/functional/services/remote/webdriver.ts
index 3bf5b865aa7ba..1b7ef2c1855d0 100644
--- a/test/functional/services/remote/webdriver.ts
+++ b/test/functional/services/remote/webdriver.ts
@@ -30,10 +30,12 @@ import geckoDriver from 'geckodriver';
import { Builder, Capabilities, By, logging, until } from 'selenium-webdriver';
import chrome from 'selenium-webdriver/chrome';
import firefox from 'selenium-webdriver/firefox';
+import edge from 'selenium-webdriver/edge';
// @ts-ignore internal modules are not typed
import { Executor } from 'selenium-webdriver/lib/http';
// @ts-ignore internal modules are not typed
import { getLogger } from 'selenium-webdriver/lib/logging';
+import { installDriver } from 'ms-chromium-edge-driver';
import { pollForLogEntry$ } from './poll_for_log_entry';
import { createStdoutSocket } from './create_stdout_stream';
@@ -63,6 +65,7 @@ Executor.prototype.execute = preventParallelCalls(
);
let attemptCounter = 0;
+let edgePaths: { driverPath: string | undefined; browserPath: string | undefined };
async function attemptToCreateCommand(
log: ToolingLog,
browserType: Browsers,
@@ -136,6 +139,46 @@ async function attemptToCreateCommand(
};
}
+ case 'msedge': {
+ if (edgePaths && edgePaths.browserPath && edgePaths.driverPath) {
+ const edgeOptions = new edge.Options();
+ if (headlessBrowser === '1') {
+ // @ts-ignore internal modules are not typed
+ edgeOptions.headless();
+ }
+ // @ts-ignore internal modules are not typed
+ edgeOptions.setEdgeChromium(true);
+ // @ts-ignore internal modules are not typed
+ edgeOptions.setBinaryPath(edgePaths.browserPath);
+ const session = await new Builder()
+ .forBrowser('MicrosoftEdge')
+ .setEdgeOptions(edgeOptions)
+ .setEdgeService(new edge.ServiceBuilder(edgePaths.driverPath))
+ .build();
+ return {
+ session,
+ consoleLog$: pollForLogEntry$(
+ session,
+ logging.Type.BROWSER,
+ logPollingMs,
+ lifecycle.cleanup.after$
+ ).pipe(
+ takeUntil(lifecycle.cleanup.after$),
+ map(({ message, level: { name: level } }) => ({
+ message: message.replace(/\\n/g, '\n'),
+ level,
+ }))
+ ),
+ };
+ } else {
+ throw new Error(
+ `Chromium Edge session requires browser or driver path to be defined: ${JSON.stringify(
+ edgePaths
+ )}`
+ );
+ }
+ }
+
case 'firefox': {
const firefoxOptions = new firefox.Options();
// Firefox 65+ supports logging console output to stdout
@@ -265,6 +308,11 @@ export async function initWebDriver(
log.verbose(entry.message);
});
+ // download Edge driver only in case of usage
+ if (browserType === Browsers.ChromiumEdge) {
+ edgePaths = await installDriver();
+ }
+
return await Promise.race([
(async () => {
await delay(2 * MINUTE);
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/tsconfig.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/tsconfig.json
index d8096d9aab27a..544c27241f5cb 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/tsconfig.json
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/tsconfig.json
@@ -6,7 +6,8 @@
"types": [
"node",
"jest",
- "react"
+ "react",
+ "flot"
]
},
"include": [
@@ -16,4 +17,4 @@
"../../../../typings/**/*",
],
"exclude": []
-}
\ No newline at end of file
+}
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
index 23807a6e98dc2..c77ffe40db553 100755
--- a/test/scripts/jenkins_ci_group.sh
+++ b/test/scripts/jenkins_ci_group.sh
@@ -22,7 +22,7 @@ else
echo " -> running tests from the clone folder"
#yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}";
- node scripts/functional_tests --debug --include-tag "ciGroup$CI_GROUP" --config test/functional/config.coverage.js || true;
+ node scripts/functional_tests --debug --include-tag "ciGroup$CI_GROUP" --exclude-tag "skipCoverage" || true;
if [[ -d target/kibana-coverage/functional ]]; then
echo " -> replacing kibana${CI_GROUP} with kibana in json files"
diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh
index 5055997df642a..67d88b308ed91 100755
--- a/test/scripts/jenkins_xpack.sh
+++ b/test/scripts/jenkins_xpack.sh
@@ -17,7 +17,7 @@ if [[ -z "$CODE_COVERAGE" ]] ; then
echo " -> Running SIEM cyclic dependency test"
cd "$XPACK_DIR"
- checks-reporter-with-killswitch "X-Pack SIEM cyclic dependency test" node legacy/plugins/siem/scripts/check_circular_deps
+ checks-reporter-with-killswitch "X-Pack SIEM cyclic dependency test" node plugins/siem/scripts/check_circular_deps
echo ""
echo ""
@@ -39,7 +39,7 @@ else
# build runtime for canvas
echo "NODE_ENV=$NODE_ENV"
node ./legacy/plugins/canvas/scripts/shareable_runtime
- node scripts/jest --ci --verbose --coverage
+ node --max-old-space-size=6144 scripts/jest --ci --verbose --coverage
# rename file in order to be unique one
test -f ../target/kibana-coverage/jest/coverage-final.json \
&& mv ../target/kibana-coverage/jest/coverage-final.json \
diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh
index 01b13293c10ba..a6e600630364e 100755
--- a/test/scripts/jenkins_xpack_ci_group.sh
+++ b/test/scripts/jenkins_xpack_ci_group.sh
@@ -23,7 +23,7 @@ else
cd "kibana${CI_GROUP}/x-pack"
echo " -> running tests from the clone folder"
- node scripts/functional_tests --debug --include-tag "ciGroup$CI_GROUP" --config test/functional/config.coverage.js || true;
+ node scripts/functional_tests --debug --include-tag "ciGroup$CI_GROUP" --exclude-tag "skipCoverage" || true;
if [[ -d ../target/kibana-coverage/functional ]]; then
echo " -> replacing kibana${CI_GROUP} with kibana in json files"
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 285d3db64a874..5a3716e620fed 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -3,7 +3,8 @@
"compilerOptions": {
"types": [
"node",
- "mocha"
+ "mocha",
+ "flot"
],
"lib": [
"esnext",
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index 50f36ddd21c97..c8715ac3447bd 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -32,11 +32,11 @@
"xpack.remoteClusters": "plugins/remote_clusters",
"xpack.painlessLab": "plugins/painless_lab",
"xpack.reporting": ["plugins/reporting", "legacy/plugins/reporting"],
- "xpack.rollupJobs": "legacy/plugins/rollup",
+ "xpack.rollupJobs": ["legacy/plugins/rollup", "plugins/rollup"],
"xpack.searchProfiler": "plugins/searchprofiler",
"xpack.security": ["legacy/plugins/security", "plugins/security"],
"xpack.server": "legacy/server",
- "xpack.siem": "legacy/plugins/siem",
+ "xpack.siem": ["plugins/siem", "legacy/plugins/siem"],
"xpack.snapshotRestore": "plugins/snapshot_restore",
"xpack.spaces": ["legacy/plugins/spaces", "plugins/spaces"],
"xpack.taskManager": "legacy/plugins/task_manager",
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/MachineLearningFlyout/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/MachineLearningFlyout/index.tsx
index a1462c7637358..cc5c62e25b491 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/MachineLearningFlyout/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/MachineLearningFlyout/index.tsx
@@ -57,7 +57,8 @@ export class MachineLearningFlyout extends Component {
};
public addErrorToast = () => {
- const core = this.context;
+ const { core } = this.context;
+
const { urlParams } = this.props;
const { serviceName } = urlParams;
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts
index 416eb879d5974..d844ac8b5988d 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts
@@ -166,6 +166,212 @@ describe('waterfall_helpers', () => {
expect(waterfall.errorsCount).toEqual(0);
expect(waterfall).toMatchSnapshot();
});
+ it('should reparent spans', () => {
+ const traceItems = [
+ {
+ processor: { event: 'transaction' },
+ trace: { id: 'myTraceId' },
+ service: { name: 'opbeans-node' },
+ transaction: {
+ duration: { us: 49660 },
+ name: 'GET /api',
+ id: 'myTransactionId1'
+ },
+ timestamp: { us: 1549324795784006 }
+ } as Transaction,
+ {
+ parent: { id: 'mySpanIdD' },
+ processor: { event: 'span' },
+ trace: { id: 'myTraceId' },
+ service: { name: 'opbeans-ruby' },
+ transaction: { id: 'myTransactionId1' },
+ timestamp: { us: 1549324795825633 },
+ span: {
+ duration: { us: 481 },
+ name: 'SELECT FROM products',
+ id: 'mySpanIdB'
+ },
+ child_ids: ['mySpanIdA', 'mySpanIdC']
+ } as Span,
+ {
+ parent: { id: 'mySpanIdD' },
+ processor: { event: 'span' },
+ trace: { id: 'myTraceId' },
+ service: { name: 'opbeans-ruby' },
+ transaction: { id: 'myTransactionId1' },
+ span: {
+ duration: { us: 6161 },
+ name: 'Api::ProductsController#index',
+ id: 'mySpanIdA'
+ },
+ timestamp: { us: 1549324795824504 }
+ } as Span,
+ {
+ parent: { id: 'mySpanIdD' },
+ processor: { event: 'span' },
+ trace: { id: 'myTraceId' },
+ service: { name: 'opbeans-ruby' },
+ transaction: { id: 'myTransactionId1' },
+ span: {
+ duration: { us: 532 },
+ name: 'SELECT FROM product',
+ id: 'mySpanIdC'
+ },
+ timestamp: { us: 1549324795827905 }
+ } as Span,
+ {
+ parent: { id: 'myTransactionId1' },
+ processor: { event: 'span' },
+ trace: { id: 'myTraceId' },
+ service: { name: 'opbeans-node' },
+ transaction: { id: 'myTransactionId1' },
+ span: {
+ duration: { us: 47557 },
+ name: 'GET opbeans-ruby:3000/api/products',
+ id: 'mySpanIdD'
+ },
+ timestamp: { us: 1549324795785760 }
+ } as Span
+ ];
+ const entryTransactionId = 'myTransactionId1';
+ const waterfall = getWaterfall(
+ {
+ trace: { items: traceItems, errorDocs: [], exceedsMax: false },
+ errorsPerTransaction: {}
+ },
+ entryTransactionId
+ );
+ const getIdAndParentId = (item: IWaterfallItem) => ({
+ id: item.id,
+ parentId: item.parent?.id
+ });
+ expect(waterfall.items.length).toBe(5);
+ expect(getIdAndParentId(waterfall.items[0])).toEqual({
+ id: 'myTransactionId1',
+ parentId: undefined
+ });
+ expect(getIdAndParentId(waterfall.items[1])).toEqual({
+ id: 'mySpanIdD',
+ parentId: 'myTransactionId1'
+ });
+ expect(getIdAndParentId(waterfall.items[2])).toEqual({
+ id: 'mySpanIdB',
+ parentId: 'mySpanIdD'
+ });
+ expect(getIdAndParentId(waterfall.items[3])).toEqual({
+ id: 'mySpanIdA',
+ parentId: 'mySpanIdB'
+ });
+ expect(getIdAndParentId(waterfall.items[4])).toEqual({
+ id: 'mySpanIdC',
+ parentId: 'mySpanIdB'
+ });
+ expect(waterfall.errorItems.length).toBe(0);
+ expect(waterfall.errorsCount).toEqual(0);
+ });
+ it("shouldn't reparent spans when child id isn't found", () => {
+ const traceItems = [
+ {
+ processor: { event: 'transaction' },
+ trace: { id: 'myTraceId' },
+ service: { name: 'opbeans-node' },
+ transaction: {
+ duration: { us: 49660 },
+ name: 'GET /api',
+ id: 'myTransactionId1'
+ },
+ timestamp: { us: 1549324795784006 }
+ } as Transaction,
+ {
+ parent: { id: 'mySpanIdD' },
+ processor: { event: 'span' },
+ trace: { id: 'myTraceId' },
+ service: { name: 'opbeans-ruby' },
+ transaction: { id: 'myTransactionId1' },
+ timestamp: { us: 1549324795825633 },
+ span: {
+ duration: { us: 481 },
+ name: 'SELECT FROM products',
+ id: 'mySpanIdB'
+ },
+ child_ids: ['incorrectId', 'mySpanIdC']
+ } as Span,
+ {
+ parent: { id: 'mySpanIdD' },
+ processor: { event: 'span' },
+ trace: { id: 'myTraceId' },
+ service: { name: 'opbeans-ruby' },
+ transaction: { id: 'myTransactionId1' },
+ span: {
+ duration: { us: 6161 },
+ name: 'Api::ProductsController#index',
+ id: 'mySpanIdA'
+ },
+ timestamp: { us: 1549324795824504 }
+ } as Span,
+ {
+ parent: { id: 'mySpanIdD' },
+ processor: { event: 'span' },
+ trace: { id: 'myTraceId' },
+ service: { name: 'opbeans-ruby' },
+ transaction: { id: 'myTransactionId1' },
+ span: {
+ duration: { us: 532 },
+ name: 'SELECT FROM product',
+ id: 'mySpanIdC'
+ },
+ timestamp: { us: 1549324795827905 }
+ } as Span,
+ {
+ parent: { id: 'myTransactionId1' },
+ processor: { event: 'span' },
+ trace: { id: 'myTraceId' },
+ service: { name: 'opbeans-node' },
+ transaction: { id: 'myTransactionId1' },
+ span: {
+ duration: { us: 47557 },
+ name: 'GET opbeans-ruby:3000/api/products',
+ id: 'mySpanIdD'
+ },
+ timestamp: { us: 1549324795785760 }
+ } as Span
+ ];
+ const entryTransactionId = 'myTransactionId1';
+ const waterfall = getWaterfall(
+ {
+ trace: { items: traceItems, errorDocs: [], exceedsMax: false },
+ errorsPerTransaction: {}
+ },
+ entryTransactionId
+ );
+ const getIdAndParentId = (item: IWaterfallItem) => ({
+ id: item.id,
+ parentId: item.parent?.id
+ });
+ expect(waterfall.items.length).toBe(5);
+ expect(getIdAndParentId(waterfall.items[0])).toEqual({
+ id: 'myTransactionId1',
+ parentId: undefined
+ });
+ expect(getIdAndParentId(waterfall.items[1])).toEqual({
+ id: 'mySpanIdD',
+ parentId: 'myTransactionId1'
+ });
+ expect(getIdAndParentId(waterfall.items[2])).toEqual({
+ id: 'mySpanIdA',
+ parentId: 'mySpanIdD'
+ });
+ expect(getIdAndParentId(waterfall.items[3])).toEqual({
+ id: 'mySpanIdB',
+ parentId: 'mySpanIdD'
+ });
+ expect(getIdAndParentId(waterfall.items[4])).toEqual({
+ id: 'mySpanIdC',
+ parentId: 'mySpanIdB'
+ });
+ expect(waterfall.errorItems.length).toBe(0);
+ expect(waterfall.errorsCount).toEqual(0);
+ });
});
describe('getWaterfallItems', () => {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
index 58d9134c4d787..8a873b2ddf1c9 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
@@ -236,6 +236,29 @@ const getWaterfallItems = (items: TraceAPIResponse['trace']['items']) =>
}
});
+/**
+ * Changes the parent_id of items based on the child_ids property.
+ * Solves the problem of Inferred spans that are created as child of trace spans
+ * when it actually should be its parent.
+ * @param waterfallItems
+ */
+const reparentSpans = (waterfallItems: IWaterfallItem[]) => {
+ return waterfallItems.map(waterfallItem => {
+ if (waterfallItem.docType === 'span') {
+ const { child_ids: childIds } = waterfallItem.doc;
+ if (childIds) {
+ childIds.forEach(childId => {
+ const item = waterfallItems.find(_item => _item.id === childId);
+ if (item) {
+ item.parentId = waterfallItem.id;
+ }
+ });
+ }
+ }
+ return waterfallItem;
+ });
+};
+
const getChildrenGroupedByParentId = (waterfallItems: IWaterfallItem[]) =>
groupBy(waterfallItems, item => (item.parentId ? item.parentId : ROOT_ID));
@@ -306,7 +329,9 @@ export function getWaterfall(
const waterfallItems: IWaterfallItem[] = getWaterfallItems(trace.items);
- const childrenByParentId = getChildrenGroupedByParentId(waterfallItems);
+ const childrenByParentId = getChildrenGroupedByParentId(
+ reparentSpans(waterfallItems)
+ );
const entryWaterfallTransaction = getEntryWaterfallTransaction(
entryTransactionId,
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx
index 938962cc9dd18..f681f4dfc675a 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx
@@ -14,7 +14,8 @@ import {
urlParams,
simpleTrace,
traceWithErrors,
- traceChildStartBeforeParent
+ traceChildStartBeforeParent,
+ inferredSpans
} from './waterfallContainer.stories.data';
import { getWaterfall } from './Waterfall/waterfall_helpers/waterfall_helpers';
@@ -74,3 +75,22 @@ storiesOf('app/TransactionDetails/Waterfall', module).add(
},
{ info: { source: false } }
);
+
+storiesOf('app/TransactionDetails/Waterfall', module).add(
+ 'inferred spans',
+ () => {
+ const waterfall = getWaterfall(
+ inferredSpans as TraceAPIResponse,
+ 'f2387d37260d00bd'
+ );
+ return (
+
+ );
+ },
+ { info: { source: false } }
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts
index 835183e73b298..306c8e4f3fedb 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts
@@ -1645,3 +1645,667 @@ export const traceChildStartBeforeParent = {
},
errorsPerTransaction: {}
};
+
+export const inferredSpans = {
+ trace: {
+ items: [
+ {
+ container: {
+ id: 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ agent: {
+ name: 'java',
+ ephemeral_id: '1cb5c830-c677-4b13-b340-ab1502f527c3',
+ version: '1.15.1-SNAPSHOT'
+ },
+ process: {
+ pid: 6,
+ title: '/opt/java/openjdk/bin/java',
+ ppid: 1
+ },
+ source: {
+ ip: '172.18.0.8'
+ },
+ processor: {
+ name: 'transaction',
+ event: 'transaction'
+ },
+ url: {
+ path: '/api/products/2',
+ scheme: 'http',
+ port: 3000,
+ domain: '172.18.0.7',
+ full: 'http://172.18.0.7:3000/api/products/2'
+ },
+ observer: {
+ hostname: '7189f754b5a3',
+ id: 'f32d8d9f-a9f9-4355-8370-548dfd8024dc',
+ ephemeral_id: 'bff20764-0195-4f78-aa84-d799fc47b954',
+ type: 'apm-server',
+ version: '8.0.0',
+ version_major: 8
+ },
+ trace: {
+ id: '3b0dc77f3754e5bcb9da0e4c15e0db97'
+ },
+ '@timestamp': '2020-04-09T11:36:00.786Z',
+ ecs: {
+ version: '1.5.0'
+ },
+ service: {
+ node: {
+ name:
+ 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ environment: 'production',
+ name: 'opbeans-java',
+ runtime: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ language: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ version: 'None'
+ },
+ host: {
+ hostname: 'fc2ae281f56f',
+ os: {
+ platform: 'Linux'
+ },
+ ip: '172.18.0.7',
+ name: 'fc2ae281f56f',
+ architecture: 'amd64'
+ },
+ client: {
+ ip: '172.18.0.8'
+ },
+ http: {
+ request: {
+ headers: {
+ Accept: ['*/*'],
+ 'User-Agent': ['Python/3.7 aiohttp/3.3.2'],
+ Host: ['172.18.0.7:3000'],
+ 'Accept-Encoding': ['gzip, deflate']
+ },
+ method: 'get',
+ socket: {
+ encrypted: false,
+ remote_address: '172.18.0.8'
+ }
+ },
+ response: {
+ headers: {
+ 'Transfer-Encoding': ['chunked'],
+ Date: ['Thu, 09 Apr 2020 11:36:01 GMT'],
+ 'Content-Type': ['application/json;charset=UTF-8']
+ },
+ status_code: 200,
+ finished: true,
+ headers_sent: true
+ },
+ version: '1.1'
+ },
+ user_agent: {
+ original: 'Python/3.7 aiohttp/3.3.2',
+ name: 'Other',
+ device: {
+ name: 'Other'
+ }
+ },
+ transaction: {
+ duration: {
+ us: 237537
+ },
+ result: 'HTTP 2xx',
+ name: 'APIRestController#product',
+ span_count: {
+ dropped: 0,
+ started: 3
+ },
+ id: 'f2387d37260d00bd',
+ type: 'request',
+ sampled: true
+ },
+ timestamp: {
+ us: 1586432160786001
+ }
+ },
+ {
+ container: {
+ id: 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ parent: {
+ id: 'f2387d37260d00bd'
+ },
+ agent: {
+ name: 'java',
+ ephemeral_id: '1cb5c830-c677-4b13-b340-ab1502f527c3',
+ version: '1.15.1-SNAPSHOT'
+ },
+ process: {
+ pid: 6,
+ title: '/opt/java/openjdk/bin/java',
+ ppid: 1
+ },
+ processor: {
+ name: 'transaction',
+ event: 'span'
+ },
+ observer: {
+ hostname: '7189f754b5a3',
+ id: 'f32d8d9f-a9f9-4355-8370-548dfd8024dc',
+ ephemeral_id: 'bff20764-0195-4f78-aa84-d799fc47b954',
+ type: 'apm-server',
+ version: '8.0.0',
+ version_major: 8
+ },
+ trace: {
+ id: '3b0dc77f3754e5bcb9da0e4c15e0db97'
+ },
+ '@timestamp': '2020-04-09T11:36:00.810Z',
+ ecs: {
+ version: '1.5.0'
+ },
+ service: {
+ node: {
+ name:
+ 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ environment: 'production',
+ name: 'opbeans-java',
+ runtime: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ language: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ version: 'None'
+ },
+ host: {
+ hostname: 'fc2ae281f56f',
+ os: {
+ platform: 'Linux'
+ },
+ ip: '172.18.0.7',
+ name: 'fc2ae281f56f',
+ architecture: 'amd64'
+ },
+ transaction: {
+ id: 'f2387d37260d00bd'
+ },
+ span: {
+ duration: {
+ us: 204574
+ },
+ subtype: 'inferred',
+ name: 'ServletInvocableHandlerMethod#invokeAndHandle',
+ id: 'a5df600bd7bd5e38',
+ type: 'app'
+ },
+ timestamp: {
+ us: 1586432160810441
+ }
+ },
+ {
+ container: {
+ id: 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ parent: {
+ id: 'a5df600bd7bd5e38'
+ },
+ agent: {
+ name: 'java',
+ ephemeral_id: '1cb5c830-c677-4b13-b340-ab1502f527c3',
+ version: '1.15.1-SNAPSHOT'
+ },
+ process: {
+ pid: 6,
+ title: '/opt/java/openjdk/bin/java',
+ ppid: 1
+ },
+ processor: {
+ name: 'transaction',
+ event: 'span'
+ },
+ observer: {
+ hostname: '7189f754b5a3',
+ id: 'f32d8d9f-a9f9-4355-8370-548dfd8024dc',
+ type: 'apm-server',
+ ephemeral_id: 'bff20764-0195-4f78-aa84-d799fc47b954',
+ version: '8.0.0',
+ version_major: 8
+ },
+ trace: {
+ id: '3b0dc77f3754e5bcb9da0e4c15e0db97'
+ },
+ '@timestamp': '2020-04-09T11:36:00.810Z',
+ ecs: {
+ version: '1.5.0'
+ },
+ service: {
+ node: {
+ name:
+ 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ environment: 'production',
+ name: 'opbeans-java',
+ runtime: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ language: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ version: 'None'
+ },
+ host: {
+ hostname: 'fc2ae281f56f',
+ os: {
+ platform: 'Linux'
+ },
+ ip: '172.18.0.7',
+ name: 'fc2ae281f56f',
+ architecture: 'amd64'
+ },
+ transaction: {
+ id: 'f2387d37260d00bd'
+ },
+ timestamp: {
+ us: 1586432160810441
+ },
+ span: {
+ duration: {
+ us: 102993
+ },
+ stacktrace: [
+ {
+ library_frame: true,
+ exclude_from_grouping: false,
+ filename: 'InvocableHandlerMethod.java',
+ line: {
+ number: -1
+ },
+ function: 'doInvoke'
+ },
+ {
+ exclude_from_grouping: false,
+ library_frame: true,
+ filename: 'InvocableHandlerMethod.java',
+ line: {
+ number: -1
+ },
+ function: 'invokeForRequest'
+ }
+ ],
+ subtype: 'inferred',
+ name: 'APIRestController#product',
+ id: '808dc34fc41ce522',
+ type: 'app'
+ }
+ },
+ {
+ container: {
+ id: 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ parent: {
+ id: 'f2387d37260d00bd'
+ },
+ agent: {
+ name: 'java',
+ ephemeral_id: '1cb5c830-c677-4b13-b340-ab1502f527c3',
+ version: '1.15.1-SNAPSHOT'
+ },
+ process: {
+ pid: 6,
+ title: '/opt/java/openjdk/bin/java',
+ ppid: 1
+ },
+ processor: {
+ name: 'transaction',
+ event: 'span'
+ },
+ labels: {
+ productId: '2'
+ },
+ observer: {
+ hostname: '7189f754b5a3',
+ id: 'f32d8d9f-a9f9-4355-8370-548dfd8024dc',
+ ephemeral_id: 'bff20764-0195-4f78-aa84-d799fc47b954',
+ type: 'apm-server',
+ version: '8.0.0',
+ version_major: 8
+ },
+ trace: {
+ id: '3b0dc77f3754e5bcb9da0e4c15e0db97'
+ },
+ '@timestamp': '2020-04-09T11:36:00.832Z',
+ ecs: {
+ version: '1.5.0'
+ },
+ service: {
+ node: {
+ name:
+ 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ environment: 'production',
+ name: 'opbeans-java',
+ runtime: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ language: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ version: 'None'
+ },
+ host: {
+ hostname: 'fc2ae281f56f',
+ os: {
+ platform: 'Linux'
+ },
+ ip: '172.18.0.7',
+ name: 'fc2ae281f56f',
+ architecture: 'amd64'
+ },
+ transaction: {
+ id: 'f2387d37260d00bd'
+ },
+ timestamp: {
+ us: 1586432160832300
+ },
+ span: {
+ duration: {
+ us: 99295
+ },
+ name: 'OpenTracing product span',
+ id: '41226ae63af4f235',
+ type: 'unknown'
+ },
+ child_ids: ['8d80de06aa11a6fc']
+ },
+ {
+ container: {
+ id: 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ parent: {
+ id: '808dc34fc41ce522'
+ },
+ process: {
+ pid: 6,
+ title: '/opt/java/openjdk/bin/java',
+ ppid: 1
+ },
+ agent: {
+ name: 'java',
+ ephemeral_id: '1cb5c830-c677-4b13-b340-ab1502f527c3',
+ version: '1.15.1-SNAPSHOT'
+ },
+ processor: {
+ name: 'transaction',
+ event: 'span'
+ },
+ observer: {
+ hostname: '7189f754b5a3',
+ id: 'f32d8d9f-a9f9-4355-8370-548dfd8024dc',
+ ephemeral_id: 'bff20764-0195-4f78-aa84-d799fc47b954',
+ type: 'apm-server',
+ version: '8.0.0',
+ version_major: 8
+ },
+ trace: {
+ id: '3b0dc77f3754e5bcb9da0e4c15e0db97'
+ },
+ '@timestamp': '2020-04-09T11:36:00.859Z',
+ ecs: {
+ version: '1.5.0'
+ },
+ service: {
+ node: {
+ name:
+ 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ environment: 'production',
+ name: 'opbeans-java',
+ runtime: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ language: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ version: 'None'
+ },
+ host: {
+ hostname: 'fc2ae281f56f',
+ os: {
+ platform: 'Linux'
+ },
+ ip: '172.18.0.7',
+ name: 'fc2ae281f56f',
+ architecture: 'amd64'
+ },
+ transaction: {
+ id: 'f2387d37260d00bd'
+ },
+ timestamp: {
+ us: 1586432160859600
+ },
+ span: {
+ duration: {
+ us: 53835
+ },
+ subtype: 'inferred',
+ name: 'Loader#executeQueryStatement',
+ id: '8d80de06aa11a6fc',
+ type: 'app'
+ }
+ },
+ {
+ container: {
+ id: 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ parent: {
+ id: '41226ae63af4f235'
+ },
+ agent: {
+ name: 'java',
+ ephemeral_id: '1cb5c830-c677-4b13-b340-ab1502f527c3',
+ version: '1.15.1-SNAPSHOT'
+ },
+ process: {
+ pid: 6,
+ title: '/opt/java/openjdk/bin/java',
+ ppid: 1
+ },
+ destination: {
+ address: 'postgres',
+ port: 5432
+ },
+ processor: {
+ name: 'transaction',
+ event: 'span'
+ },
+ observer: {
+ hostname: '7189f754b5a3',
+ id: 'f32d8d9f-a9f9-4355-8370-548dfd8024dc',
+ ephemeral_id: 'bff20764-0195-4f78-aa84-d799fc47b954',
+ type: 'apm-server',
+ version: '8.0.0',
+ version_major: 8
+ },
+ trace: {
+ id: '3b0dc77f3754e5bcb9da0e4c15e0db97'
+ },
+ '@timestamp': '2020-04-09T11:36:00.903Z',
+ ecs: {
+ version: '1.5.0'
+ },
+ service: {
+ node: {
+ name:
+ 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ environment: 'production',
+ name: 'opbeans-java',
+ runtime: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ language: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ version: 'None'
+ },
+ host: {
+ hostname: 'fc2ae281f56f',
+ os: {
+ platform: 'Linux'
+ },
+ ip: '172.18.0.7',
+ name: 'fc2ae281f56f',
+ architecture: 'amd64'
+ },
+ transaction: {
+ id: 'f2387d37260d00bd'
+ },
+ timestamp: {
+ us: 1586432160903236
+ },
+ span: {
+ duration: {
+ us: 10211
+ },
+ subtype: 'postgresql',
+ destination: {
+ service: {
+ resource: 'postgresql',
+ name: 'postgresql',
+ type: 'db'
+ }
+ },
+ name: 'SELECT FROM products',
+ action: 'query',
+ id: '3708d5623658182f',
+ type: 'db',
+ db: {
+ statement:
+ 'select product0_.id as col_0_0_, product0_.sku as col_1_0_, product0_.name as col_2_0_, product0_.description as col_3_0_, product0_.cost as col_4_0_, product0_.selling_price as col_5_0_, product0_.stock as col_6_0_, producttyp1_.id as col_7_0_, producttyp1_.name as col_8_0_, (select sum(orderline2_.amount) from order_lines orderline2_ where orderline2_.product_id=product0_.id) as col_9_0_ from products product0_ left outer join product_types producttyp1_ on product0_.type_id=producttyp1_.id where product0_.id=?',
+ type: 'sql',
+ user: {
+ name: 'postgres'
+ }
+ }
+ }
+ },
+ {
+ container: {
+ id: 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ parent: {
+ id: '41226ae63af4f235'
+ },
+ process: {
+ pid: 6,
+ title: '/opt/java/openjdk/bin/java',
+ ppid: 1
+ },
+ agent: {
+ name: 'java',
+ ephemeral_id: '1cb5c830-c677-4b13-b340-ab1502f527c3',
+ version: '1.15.1-SNAPSHOT'
+ },
+ destination: {
+ address: 'postgres',
+ port: 5432
+ },
+ processor: {
+ name: 'transaction',
+ event: 'span'
+ },
+ observer: {
+ hostname: '7189f754b5a3',
+ id: 'f32d8d9f-a9f9-4355-8370-548dfd8024dc',
+ ephemeral_id: 'bff20764-0195-4f78-aa84-d799fc47b954',
+ type: 'apm-server',
+ version: '8.0.0',
+ version_major: 8
+ },
+ trace: {
+ id: '3b0dc77f3754e5bcb9da0e4c15e0db97'
+ },
+ '@timestamp': '2020-04-09T11:36:00.859Z',
+ ecs: {
+ version: '1.5.0'
+ },
+ service: {
+ node: {
+ name:
+ 'fc2ae281f56fb84728bc9b5e6c17f3d13bbb7f4efd461158558e5c38e655abad'
+ },
+ environment: 'production',
+ name: 'opbeans-java',
+ runtime: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ language: {
+ name: 'Java',
+ version: '11.0.6'
+ },
+ version: 'None'
+ },
+ host: {
+ hostname: 'fc2ae281f56f',
+ os: {
+ platform: 'Linux'
+ },
+ ip: '172.18.0.7',
+ name: 'fc2ae281f56f',
+ architecture: 'amd64'
+ },
+ transaction: {
+ id: 'f2387d37260d00bd'
+ },
+ timestamp: {
+ us: 1586432160859508
+ },
+ span: {
+ duration: {
+ us: 4503
+ },
+ subtype: 'postgresql',
+ destination: {
+ service: {
+ resource: 'postgresql',
+ name: 'postgresql',
+ type: 'db'
+ }
+ },
+ name: 'empty query',
+ action: 'query',
+ id: '9871cfd612368932',
+ type: 'db',
+ db: {
+ rows_affected: 0,
+ statement: '(empty query)',
+ type: 'sql',
+ user: {
+ name: 'postgres'
+ }
+ }
+ }
+ }
+ ],
+ exceedsMax: false,
+ errorDocs: []
+ },
+ errorsPerTransaction: {}
+};
diff --git a/x-pack/legacy/plugins/apm/public/services/rest/ml.ts b/x-pack/legacy/plugins/apm/public/services/rest/ml.ts
index 1c618098b36e3..0cd1bdf907531 100644
--- a/x-pack/legacy/plugins/apm/public/services/rest/ml.ts
+++ b/x-pack/legacy/plugins/apm/public/services/rest/ml.ts
@@ -12,7 +12,8 @@ import {
} from '../../../../../../plugins/apm/common/elasticsearch_fieldnames';
import {
getMlJobId,
- getMlPrefix
+ getMlPrefix,
+ encodeForMlApi
} from '../../../../../../plugins/apm/common/ml_job_constants';
import { callApi } from './callApi';
import { ESFilter } from '../../../../../../plugins/apm/typings/elasticsearch';
@@ -53,13 +54,16 @@ export async function startMLJob({
http: HttpSetup;
}) {
const transactionIndices = await getTransactionIndices(http);
- const groups = ['apm', serviceName.toLowerCase()];
+ const groups = [
+ 'apm',
+ encodeForMlApi(serviceName),
+ encodeForMlApi(transactionType)
+ ];
const filter: ESFilter[] = [
{ term: { [SERVICE_NAME]: serviceName } },
{ term: { [PROCESSOR_EVENT]: 'transaction' } },
{ term: { [TRANSACTION_TYPE]: transactionType } }
];
- groups.push(transactionType.toLowerCase());
return callApi(http, {
method: 'POST',
pathname: `/api/ml/modules/setup/apm_transaction`,
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/public/np_ready/app/services/api.js b/x-pack/legacy/plugins/cross_cluster_replication/public/np_ready/app/services/api.js
index b50c36aa8df9f..24bc7e17356e2 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/public/np_ready/app/services/api.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/public/np_ready/app/services/api.js
@@ -145,9 +145,35 @@ export const updateFollowerIndex = (id, followerIndex) => {
if (isUsingAdvancedSettings) {
uiMetrics.push(UIM_FOLLOWER_INDEX_USE_ADVANCED_OPTIONS);
}
+
+ const {
+ maxReadRequestOperationCount,
+ maxOutstandingReadRequests,
+ maxReadRequestSize,
+ maxWriteRequestOperationCount,
+ maxWriteRequestSize,
+ maxOutstandingWriteRequests,
+ maxWriteBufferCount,
+ maxWriteBufferSize,
+ maxRetryDelay,
+ readPollTimeout,
+ } = followerIndex;
+
const request = httpClient.put(`${API_BASE_PATH}/follower_indices/${encodeURIComponent(id)}`, {
- body: JSON.stringify(followerIndex),
+ body: JSON.stringify({
+ maxReadRequestOperationCount,
+ maxOutstandingReadRequests,
+ maxReadRequestSize,
+ maxWriteRequestOperationCount,
+ maxWriteRequestSize,
+ maxOutstandingWriteRequests,
+ maxWriteBufferCount,
+ maxWriteBufferSize,
+ maxRetryDelay,
+ readPollTimeout,
+ }),
});
+
return trackUserRequest(request, uiMetrics);
};
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/server/np_ready/routes/api/follower_index.ts b/x-pack/legacy/plugins/cross_cluster_replication/server/np_ready/routes/api/follower_index.ts
index 3896e1c02c915..1d7dacf4a8688 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/server/np_ready/routes/api/follower_index.ts
+++ b/x-pack/legacy/plugins/cross_cluster_replication/server/np_ready/routes/api/follower_index.ts
@@ -164,6 +164,18 @@ export const registerFollowerIndexRoutes = ({ router, __LEGACY }: RouteDependenc
path: `${API_BASE_PATH}/follower_indices/{id}`,
validate: {
params: schema.object({ id: schema.string() }),
+ body: schema.object({
+ maxReadRequestOperationCount: schema.maybe(schema.number()),
+ maxOutstandingReadRequests: schema.maybe(schema.number()),
+ maxReadRequestSize: schema.maybe(schema.string()), // byte value
+ maxWriteRequestOperationCount: schema.maybe(schema.number()),
+ maxWriteRequestSize: schema.maybe(schema.string()), // byte value
+ maxOutstandingWriteRequests: schema.maybe(schema.number()),
+ maxWriteBufferCount: schema.maybe(schema.number()),
+ maxWriteBufferSize: schema.maybe(schema.string()), // byte value
+ maxRetryDelay: schema.maybe(schema.string()), // time value
+ readPollTimeout: schema.maybe(schema.string()), // time value
+ }),
},
},
licensePreRoutingFactory({
diff --git a/x-pack/legacy/plugins/siem/scripts/check_circular_deps.js b/x-pack/legacy/plugins/maps/common/get_join_key.ts
similarity index 66%
rename from x-pack/legacy/plugins/siem/scripts/check_circular_deps.js
rename to x-pack/legacy/plugins/maps/common/get_join_key.ts
index 046cc010621d7..004f12ca08d2e 100644
--- a/x-pack/legacy/plugins/siem/scripts/check_circular_deps.js
+++ b/x-pack/legacy/plugins/maps/common/get_join_key.ts
@@ -4,5 +4,5 @@
* you may not use this file except in compliance with the Elastic License.
*/
-require('../../../../../src/setup_node_env');
-require('../dev_tools/circular_deps/run_check_circular_deps_cli');
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+export * from '../../../../plugins/maps/common/get_join_key';
diff --git a/x-pack/legacy/plugins/maps/common/migrations/join_agg_key.test.ts b/x-pack/legacy/plugins/maps/common/migrations/join_agg_key.test.ts
new file mode 100644
index 0000000000000..d92bf06541433
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/common/migrations/join_agg_key.test.ts
@@ -0,0 +1,140 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { LAYER_TYPE } from '../constants';
+import { migrateJoinAggKey } from './join_agg_key';
+
+describe('migrateJoinAggKey', () => {
+ const joins = [
+ {
+ leftField: 'machine.os',
+ right: {
+ id: '9055b4aa-136a-4b6d-90ab-9f94ccfe5eb5',
+ indexPatternTitle: 'kibana_sample_data_logs',
+ term: 'machine.os.keyword',
+ metrics: [
+ {
+ type: 'avg',
+ field: 'bytes',
+ },
+ {
+ type: 'count',
+ },
+ ],
+ whereQuery: {
+ query: 'bytes > 10000',
+ language: 'kuery',
+ },
+ indexPatternRefName: 'layer_1_join_0_index_pattern',
+ },
+ },
+ {
+ leftField: 'machine.os',
+ right: {
+ id: '9a7f4e71-9500-4512-82f1-b7eaee3d87ff',
+ indexPatternTitle: 'kibana_sample_data_logs',
+ term: 'machine.os.keyword',
+ whereQuery: {
+ query: 'bytes < 10000',
+ language: 'kuery',
+ },
+ metrics: [
+ {
+ type: 'avg',
+ field: 'bytes',
+ },
+ ],
+ indexPatternRefName: 'layer_1_join_1_index_pattern',
+ },
+ },
+ ];
+
+ test('Should handle missing layerListJSON attribute', () => {
+ const attributes = {
+ title: 'my map',
+ };
+ expect(migrateJoinAggKey({ attributes })).toEqual({
+ title: 'my map',
+ });
+ });
+
+ test('Should migrate vector styles from legacy join agg key to new join agg key', () => {
+ const layerListJSON = JSON.stringify([
+ {
+ type: LAYER_TYPE.VECTOR,
+ joins,
+ style: {
+ properties: {
+ fillColor: {
+ type: 'DYNAMIC',
+ options: {
+ color: 'Blues',
+ colorCategory: 'palette_0',
+ field: {
+ name:
+ '__kbnjoin__avg_of_bytes_groupby_kibana_sample_data_logs.machine.os.keyword',
+ origin: 'join',
+ },
+ fieldMetaOptions: {
+ isEnabled: true,
+ sigma: 3,
+ },
+ type: 'ORDINAL',
+ },
+ },
+ lineColor: {
+ type: 'DYNAMIC',
+ options: {
+ color: 'Blues',
+ colorCategory: 'palette_0',
+ field: {
+ name: '__kbnjoin__count_groupby_kibana_sample_data_logs.machine.os.keyword',
+ origin: 'join',
+ },
+ fieldMetaOptions: {
+ isEnabled: true,
+ sigma: 3,
+ },
+ type: 'ORDINAL',
+ },
+ },
+ lineWidth: {
+ type: 'DYNAMIC',
+ options: {
+ color: 'Blues',
+ colorCategory: 'palette_0',
+ field: {
+ name: 'mySourceField',
+ origin: 'source',
+ },
+ fieldMetaOptions: {
+ isEnabled: true,
+ sigma: 3,
+ },
+ type: 'ORDINAL',
+ },
+ },
+ },
+ },
+ },
+ ]);
+ const attributes = {
+ title: 'my map',
+ layerListJSON,
+ };
+ const { layerListJSON: migratedLayerListJSON } = migrateJoinAggKey({ attributes });
+ const migratedLayerList = JSON.parse(migratedLayerListJSON!);
+ expect(migratedLayerList[0].style.properties.fillColor.options.field.name).toBe(
+ '__kbnjoin__avg_of_bytes__9055b4aa-136a-4b6d-90ab-9f94ccfe5eb5'
+ );
+ expect(migratedLayerList[0].style.properties.lineColor.options.field.name).toBe(
+ '__kbnjoin__count__9055b4aa-136a-4b6d-90ab-9f94ccfe5eb5'
+ );
+ expect(migratedLayerList[0].style.properties.lineWidth.options.field.name).toBe(
+ 'mySourceField'
+ );
+ });
+});
diff --git a/x-pack/legacy/plugins/maps/common/migrations/join_agg_key.ts b/x-pack/legacy/plugins/maps/common/migrations/join_agg_key.ts
new file mode 100644
index 0000000000000..29661aedb550c
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/common/migrations/join_agg_key.ts
@@ -0,0 +1,121 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import _ from 'lodash';
+import {
+ AGG_DELIMITER,
+ AGG_TYPE,
+ FIELD_ORIGIN,
+ JOIN_FIELD_NAME_PREFIX,
+ LAYER_TYPE,
+ VECTOR_STYLES,
+} from '../constants';
+import { getJoinAggKey } from '../get_join_key';
+import {
+ AggDescriptor,
+ JoinDescriptor,
+ LayerDescriptor,
+ VectorLayerDescriptor,
+} from '../descriptor_types';
+import { MapSavedObjectAttributes } from '../../../../../plugins/maps/common/map_saved_object_type';
+
+const GROUP_BY_DELIMITER = '_groupby_';
+
+function getLegacyAggKey({
+ aggType,
+ aggFieldName,
+ indexPatternTitle,
+ termFieldName,
+}: {
+ aggType: AGG_TYPE;
+ aggFieldName?: string;
+ indexPatternTitle: string;
+ termFieldName: string;
+}): string {
+ const metricKey =
+ aggType !== AGG_TYPE.COUNT ? `${aggType}${AGG_DELIMITER}${aggFieldName}` : aggType;
+ return `${JOIN_FIELD_NAME_PREFIX}${metricKey}${GROUP_BY_DELIMITER}${indexPatternTitle}.${termFieldName}`;
+}
+
+function parseLegacyAggKey(legacyAggKey: string): { aggType: AGG_TYPE; aggFieldName?: string } {
+ const groupBySplit = legacyAggKey
+ .substring(JOIN_FIELD_NAME_PREFIX.length)
+ .split(GROUP_BY_DELIMITER);
+ const metricKey = groupBySplit[0];
+ const metricKeySplit = metricKey.split(AGG_DELIMITER);
+ return {
+ aggType: metricKeySplit[0] as AGG_TYPE,
+ aggFieldName: metricKeySplit.length === 2 ? metricKeySplit[1] : undefined,
+ };
+}
+
+export function migrateJoinAggKey({
+ attributes,
+}: {
+ attributes: MapSavedObjectAttributes;
+}): MapSavedObjectAttributes {
+ if (!attributes || !attributes.layerListJSON) {
+ return attributes;
+ }
+
+ const layerList: LayerDescriptor[] = JSON.parse(attributes.layerListJSON);
+ layerList.forEach((layerDescriptor: LayerDescriptor) => {
+ if (
+ layerDescriptor.type === LAYER_TYPE.VECTOR ||
+ layerDescriptor.type === LAYER_TYPE.BLENDED_VECTOR
+ ) {
+ const vectorLayerDescriptor = layerDescriptor as VectorLayerDescriptor;
+
+ if (
+ !vectorLayerDescriptor.style ||
+ !vectorLayerDescriptor.joins ||
+ vectorLayerDescriptor.joins.length === 0
+ ) {
+ return;
+ }
+
+ const legacyJoinFields = new Map();
+ vectorLayerDescriptor.joins.forEach((joinDescriptor: JoinDescriptor) => {
+ _.get(joinDescriptor, 'right.metrics', []).forEach((aggDescriptor: AggDescriptor) => {
+ const legacyAggKey = getLegacyAggKey({
+ aggType: aggDescriptor.type,
+ aggFieldName: aggDescriptor.field,
+ indexPatternTitle: _.get(joinDescriptor, 'right.indexPatternTitle', ''),
+ termFieldName: _.get(joinDescriptor, 'right.term', ''),
+ });
+ // The legacy getAggKey implemenation has a naming collision bug where
+ // aggType, aggFieldName, indexPatternTitle, and termFieldName would result in the identical aggKey.
+ // The VectorStyle implemenation used the first matching join descriptor
+ // so, in the event of a name collision, the first join descriptor will be used here as well.
+ if (!legacyJoinFields.has(legacyAggKey)) {
+ legacyJoinFields.set(legacyAggKey, joinDescriptor);
+ }
+ });
+ });
+
+ Object.keys(vectorLayerDescriptor.style.properties).forEach(key => {
+ const style: any = vectorLayerDescriptor.style!.properties[key as VECTOR_STYLES];
+ if (_.get(style, 'options.field.origin') === FIELD_ORIGIN.JOIN) {
+ const joinDescriptor = legacyJoinFields.get(style.options.field.name);
+ if (joinDescriptor) {
+ const { aggType, aggFieldName } = parseLegacyAggKey(style.options.field.name);
+ // Update legacy join agg key to new join agg key
+ style.options.field.name = getJoinAggKey({
+ aggType,
+ aggFieldName,
+ rightSourceId: joinDescriptor.right.id!,
+ });
+ }
+ }
+ });
+ }
+ });
+
+ return {
+ ...attributes,
+ layerListJSON: JSON.stringify(layerList),
+ };
+}
diff --git a/x-pack/legacy/plugins/maps/index.js b/x-pack/legacy/plugins/maps/index.js
index 1a7f478d3bbad..f4e01efc05f45 100644
--- a/x-pack/legacy/plugins/maps/index.js
+++ b/x-pack/legacy/plugins/maps/index.js
@@ -38,6 +38,7 @@ export function maps(kibana) {
return {
showMapVisualizationTypes: serverConfig.get('xpack.maps.showMapVisualizationTypes'),
showMapsInspectorAdapter: serverConfig.get('xpack.maps.showMapsInspectorAdapter'),
+ enableVectorTiles: serverConfig.get('xpack.maps.enableVectorTiles'),
preserveDrawingBuffer: serverConfig.get('xpack.maps.preserveDrawingBuffer'),
isEmsEnabled: mapConfig.includeElasticMapsService,
emsFontLibraryUrl: mapConfig.emsFontLibraryUrl,
@@ -85,6 +86,7 @@ export function maps(kibana) {
showMapVisualizationTypes: Joi.boolean().default(false),
showMapsInspectorAdapter: Joi.boolean().default(false), // flag used in functional testing
preserveDrawingBuffer: Joi.boolean().default(false), // flag used in functional testing
+ enableVectorTiles: Joi.boolean().default(false), // flag used to enable/disable vector-tiles
}).default();
},
diff --git a/x-pack/legacy/plugins/maps/migrations.js b/x-pack/legacy/plugins/maps/migrations.js
index 6a1f5bc937497..a8e69eef7a02f 100644
--- a/x-pack/legacy/plugins/maps/migrations.js
+++ b/x-pack/legacy/plugins/maps/migrations.js
@@ -11,6 +11,7 @@ import { moveApplyGlobalQueryToSources } from './common/migrations/move_apply_gl
import { addFieldMetaOptions } from './common/migrations/add_field_meta_options';
import { migrateSymbolStyleDescriptor } from './common/migrations/migrate_symbol_style_descriptor';
import { migrateUseTopHitsToScalingType } from './common/migrations/scaling_type';
+import { migrateJoinAggKey } from './common/migrations/join_agg_key';
export const migrations = {
map: {
@@ -57,5 +58,13 @@ export const migrations = {
attributes: attributesPhase2,
};
},
+ '7.8.0': doc => {
+ const attributes = migrateJoinAggKey(doc);
+
+ return {
+ ...doc,
+ attributes,
+ };
+ },
},
};
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/view.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/view.js
index a54df69471aa0..92fcf01f3901f 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/view.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/view.js
@@ -63,13 +63,13 @@ export class AddLayerPanel extends Component {
return;
}
- const style =
+ const styleDescriptor =
this.state.layer && this.state.layer.getCurrentStyle()
? this.state.layer.getCurrentStyle().getDescriptor()
: null;
const layerInitProps = {
...options,
- style: style,
+ style: styleDescriptor,
};
const newLayer = source.createDefaultLayer(layerInitProps, this.props.mapColors);
if (!this._isMounted) {
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/layer_settings/index.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/layer_settings/index.js
index 73c98db8e429d..e8f980bbbf2b4 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/layer_settings/index.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/layer_settings/index.js
@@ -13,10 +13,13 @@ import {
updateLayerMinZoom,
updateLayerAlpha,
} from '../../../actions/map_actions';
+import { MAX_ZOOM } from '../../../../../../../plugins/maps/common/constants';
function mapStateToProps(state = {}) {
const selectedLayer = getSelectedLayer(state);
return {
+ minVisibilityZoom: selectedLayer.getMinSourceZoom(),
+ maxVisibilityZoom: MAX_ZOOM,
alpha: selectedLayer.getAlpha(),
label: selectedLayer.getLabel(),
layerId: selectedLayer.getId(),
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.js
index bd27450943638..1d352913e54a3 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.js
@@ -13,8 +13,6 @@ import { ValidatedRange } from '../../../../../../../plugins/maps/public/compone
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import { ValidatedDualRange } from '../../../../../../../../src/plugins/kibana_react/public';
-import { MAX_ZOOM, MIN_ZOOM } from '../../../../common/constants';
-
export function LayerSettings(props) {
const onLabelChange = event => {
const label = event.target.value;
@@ -22,8 +20,8 @@ export function LayerSettings(props) {
};
const onZoomChange = ([min, max]) => {
- props.updateMinZoom(props.layerId, Math.max(MIN_ZOOM, parseInt(min, 10)));
- props.updateMaxZoom(props.layerId, Math.min(MAX_ZOOM, parseInt(max, 10)));
+ props.updateMinZoom(props.layerId, Math.max(props.minVisibilityZoom, parseInt(min, 10)));
+ props.updateMaxZoom(props.layerId, Math.min(props.maxVisibilityZoom, parseInt(max, 10)));
};
const onAlphaChange = alpha => {
@@ -38,8 +36,8 @@ export function LayerSettings(props) {
defaultMessage: 'Visibility',
})}
formRowDisplay="columnCompressed"
- min={MIN_ZOOM}
- max={MAX_ZOOM}
+ min={props.minVisibilityZoom}
+ max={props.maxVisibilityZoom}
value={[props.minZoom, props.maxZoom]}
showInput="inputWithPopover"
showRange
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js
index 1fe3d0d493ee7..a36e1d7048e92 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js
@@ -14,7 +14,12 @@ import {
} from './utils';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { getGlyphUrl, isRetina } from '../../../../../../../plugins/maps/public/meta';
-import { DECIMAL_DEGREES_PRECISION, ZOOM_PRECISION } from '../../../../common/constants';
+import {
+ DECIMAL_DEGREES_PRECISION,
+ MAX_ZOOM,
+ MIN_ZOOM,
+ ZOOM_PRECISION,
+} from '../../../../common/constants';
import mapboxgl from 'mapbox-gl/dist/mapbox-gl-csp';
import mbWorkerUrl from '!!file-loader!mapbox-gl/dist/mapbox-gl-csp-worker';
import mbRtlPlugin from '!!file-loader!@mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.min.js';
@@ -132,6 +137,8 @@ export class MBMapContainer extends React.Component {
scrollZoom: this.props.scrollZoom,
preserveDrawingBuffer: getInjectedVarFunc()('preserveDrawingBuffer', false),
interactive: !this.props.disableInteractive,
+ minZoom: MIN_ZOOM,
+ maxZoom: MAX_ZOOM,
};
const initialView = _.get(this.props.goto, 'center');
if (initialView) {
diff --git a/x-pack/legacy/plugins/maps/public/plugin.ts b/x-pack/legacy/plugins/maps/public/plugin.ts
index 4ec068ff44029..71f1a30c1fbef 100644
--- a/x-pack/legacy/plugins/maps/public/plugin.ts
+++ b/x-pack/legacy/plugins/maps/public/plugin.ts
@@ -4,13 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import '../../../../plugins/maps/public/layers/layer_wizard_registry';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import '../../../../plugins/maps/public/layers/sources/source_registry';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import '../../../../plugins/maps/public/layers/load_layer_wizards';
-
import { Plugin, CoreStart, CoreSetup } from 'src/core/public';
// @ts-ignore
import { Start as InspectorStartContract } from 'src/plugins/inspector/public';
diff --git a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
index f350a2c944756..1e71025935519 100644
--- a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
+++ b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
@@ -19,6 +19,8 @@ import { BlendedVectorLayer } from '../../../../../plugins/maps/public/layers/bl
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { getTimeFilter } from '../../../../../plugins/maps/public/kibana_services';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { TiledVectorLayer } from '../../../../../plugins/maps/public/layers/tiled_vector_layer';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { getInspectorAdapters } from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
import {
copyPersistentState,
@@ -51,6 +53,8 @@ function createLayerInstance(layerDescriptor, inspectorAdapters) {
return new HeatmapLayer({ layerDescriptor, source });
case BlendedVectorLayer.type:
return new BlendedVectorLayer({ layerDescriptor, source });
+ case TiledVectorLayer.type:
+ return new TiledVectorLayer({ layerDescriptor, source });
default:
throw new Error(`Unrecognized layerType ${layerDescriptor.type}`);
}
diff --git a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js
index b83be301653b8..72cc748617540 100644
--- a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js
+++ b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js
@@ -5,6 +5,7 @@
*/
jest.mock('../../../../../plugins/maps/public/layers/vector_layer', () => {});
+jest.mock('../../../../../plugins/maps/public/layers/tiled_vector_layer', () => {});
jest.mock('../../../../../plugins/maps/public/layers/blended_vector_layer', () => {});
jest.mock('../../../../../plugins/maps/public/layers/heatmap_layer', () => {});
jest.mock('../../../../../plugins/maps/public/layers/vector_tile_layer', () => {});
diff --git a/x-pack/legacy/plugins/rollup/README.md b/x-pack/legacy/plugins/rollup/README.md
index 6d04973de591e..3647be38b6a09 100644
--- a/x-pack/legacy/plugins/rollup/README.md
+++ b/x-pack/legacy/plugins/rollup/README.md
@@ -14,7 +14,7 @@ The rest of this doc dives into the implementation details of each of the above
## Create and manage rollup jobs
-The most straight forward part of this plugin! A new app called Rollup Jobs is registered in the Management section and follows a typical CRUD UI pattern. This app allows users to create, start, stop, clone, and delete rollup jobs. There is no way to edit an existing rollup job; instead, the UI offers a cloning ability. The client-side portion of this app lives [here](public/crud_app) and uses endpoints registered [here](server/routes/api/jobs.js).
+The most straight forward part of this plugin! A new app called Rollup Jobs is registered in the Management section and follows a typical CRUD UI pattern. This app allows users to create, start, stop, clone, and delete rollup jobs. There is no way to edit an existing rollup job; instead, the UI offers a cloning ability. The client-side portion of this app lives [here](../../../plugins/rollup/public/crud_app) and uses endpoints registered [here](server/routes/api/jobs.js).
Refer to the [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/rollup-getting-started.html) to understand rollup indices and how to create rollup jobs.
@@ -22,22 +22,22 @@ Refer to the [Elasticsearch documentation](https://www.elastic.co/guide/en/elast
Kibana uses index patterns to consume and visualize rollup indices. Typically, Kibana can inspect the indices captured by an index pattern, identify its aggregations and fields, and determine how to consume the data. Rollup indices don't contain this type of information, so we predefine how to consume a rollup index pattern with the type and typeMeta fields on the index pattern saved object. All rollup index patterns have `type` defined as "rollup" and `typeMeta` defined as an object of the index pattern's capabilities.
-In the Index Pattern app, the "Create index pattern" button includes a context menu when a rollup index is detected. This menu offers items for creating a standard index pattern and a rollup index pattern. A [rollup config is registered to index pattern creation extension point](public/index_pattern_creation/rollup_index_pattern_creation_config.js). The context menu behavior in particular uses the `getIndexPatternCreationOption()` method. When the user chooses to create a rollup index pattern, this config changes the behavior of the index pattern creation wizard:
+In the Index Pattern app, the "Create index pattern" button includes a context menu when a rollup index is detected. This menu offers items for creating a standard index pattern and a rollup index pattern. A [rollup config is registered to index pattern creation extension point](../../../plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js). The context menu behavior in particular uses the `getIndexPatternCreationOption()` method. When the user chooses to create a rollup index pattern, this config changes the behavior of the index pattern creation wizard:
1. Adds a `Rollup` badge to rollup indices using `getIndexTags()`.
2. Enforces index pattern rules using `checkIndicesForErrors()`. Rollup index patterns must match **one** rollup index, and optionally, any number of regular indices. A rollup index pattern configured with one or more regular indices is known as a "hybrid" index pattern. This allows the user to visualize historical (rollup) data and live (regular) data in the same visualization.
3. Routes to this plugin's [rollup `_fields_for_wildcard` endpoint](server/routes/api/index_patterns.js), instead of the standard one, using `getFetchForWildcardOptions()`, so that the internal rollup data field names are mapped to the original field names.
4. Writes additional information about aggregations, fields, histogram interval, and date histogram interval and timezone to the rollup index pattern saved object using `getIndexPatternMappings()`. This collection of information is referred to as its "capabilities".
-Once a rollup index pattern is created, it is tagged with `Rollup` in the list of index patterns, and its details page displays capabilities information. This is done by registering [yet another config for the index pattern list](public/index_pattern_list/rollup_index_pattern_list_config.js) extension points.
+Once a rollup index pattern is created, it is tagged with `Rollup` in the list of index patterns, and its details page displays capabilities information. This is done by registering [yet another config for the index pattern list](../../../plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js) extension points.
## Create visualizations from rollup index patterns
This plugin enables the user to create visualizations from rollup data using the Visualize app, excluding TSVB, Vega, and Timelion. When Visualize sends search requests, this plugin routes the requests to the [Elasticsearch rollup search endpoint](https://www.elastic.co/guide/en/elasticsearch/reference/current/rollup-search.html), which searches the special document structure within rollup indices. The visualization options available to users are based on the capabilities of the rollup index pattern they're visualizing.
-Routing to the Elasticsearch rollup search endpoint is done by creating an extension point in Courier, effectively allowing multiple "search strategies" to be registered. A [rollup search strategy](public/search/register.js) is registered by this plugin that queries [this plugin's rollup search endpoint](server/routes/api/search.js).
+Routing to the Elasticsearch rollup search endpoint is done by creating an extension point in Courier, effectively allowing multiple "search strategies" to be registered. A [rollup search strategy](../../../plugins/rollup/public/search/register.js) is registered by this plugin that queries [this plugin's rollup search endpoint](server/routes/api/search.js).
-Limiting visualization editor options is done by [registering configs](public/visualize/index.js) to various vis extension points. These configs use information stored on the rollup index pattern to limit:
+Limiting visualization editor options is done by [registering configs](../../../plugins/rollup/public/visualize/index.js) to various vis extension points. These configs use information stored on the rollup index pattern to limit:
* Available aggregation types
* Available fields for a particular aggregation
* Default and base interval for histogram aggregation
@@ -47,6 +47,6 @@ Limiting visualization editor options is done by [registering configs](public/vi
In Index Management, similar to system indices, rollup indices are hidden by default. A toggle is provided to show rollup indices and add a badge to the table rows. This is done by using Index Management's extension points.
-The toggle and badge are registered on client-side [here](public/extend_index_management/index.js).
+The toggle and badge are registered on client-side [here](../../../plugins/rollup/public/extend_index_management/index.js).
Additional data needed to filter rollup indices in Index Management is provided with a [data enricher](rollup_data_enricher.js).
diff --git a/x-pack/legacy/plugins/rollup/common/index.ts b/x-pack/legacy/plugins/rollup/common/index.ts
index 4229803462203..526af055a3ef6 100644
--- a/x-pack/legacy/plugins/rollup/common/index.ts
+++ b/x-pack/legacy/plugins/rollup/common/index.ts
@@ -16,24 +16,4 @@ export const PLUGIN = {
},
};
-export const CONFIG_ROLLUPS = 'rollups:enableIndexPatterns';
-
-export const API_BASE_PATH = '/api/rollup';
-
-export {
- UIM_APP_NAME,
- UIM_APP_LOAD,
- UIM_JOB_CREATE,
- UIM_JOB_DELETE,
- UIM_JOB_DELETE_MANY,
- UIM_JOB_START,
- UIM_JOB_START_MANY,
- UIM_JOB_STOP,
- UIM_JOB_STOP_MANY,
- UIM_SHOW_DETAILS_CLICK,
- UIM_DETAIL_PANEL_SUMMARY_TAB_CLICK,
- UIM_DETAIL_PANEL_TERMS_TAB_CLICK,
- UIM_DETAIL_PANEL_HISTOGRAM_TAB_CLICK,
- UIM_DETAIL_PANEL_METRICS_TAB_CLICK,
- UIM_DETAIL_PANEL_JSON_TAB_CLICK,
-} from './ui_metric';
+export * from '../../../../plugins/rollup/common';
diff --git a/x-pack/legacy/plugins/rollup/index.ts b/x-pack/legacy/plugins/rollup/index.ts
index 2c8363cc397f4..f33ae7cfee0a2 100644
--- a/x-pack/legacy/plugins/rollup/index.ts
+++ b/x-pack/legacy/plugins/rollup/index.ts
@@ -4,43 +4,19 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { resolve } from 'path';
-import { i18n } from '@kbn/i18n';
import { PluginInitializerContext } from 'src/core/server';
import { RollupSetup } from '../../../plugins/rollup/server';
-import { PLUGIN, CONFIG_ROLLUPS } from './common';
+import { PLUGIN } from './common';
import { plugin } from './server';
export function rollup(kibana: any) {
return new kibana.Plugin({
id: PLUGIN.ID,
configPrefix: 'xpack.rollup',
- publicDir: resolve(__dirname, 'public'),
require: ['kibana', 'elasticsearch', 'xpack_main'],
- uiExports: {
- styleSheetPaths: resolve(__dirname, 'public/index.scss'),
- managementSections: ['plugins/rollup/legacy'],
- uiSettingDefaults: {
- [CONFIG_ROLLUPS]: {
- name: i18n.translate('xpack.rollupJobs.rollupIndexPatternsTitle', {
- defaultMessage: 'Enable rollup index patterns',
- }),
- value: true,
- description: i18n.translate('xpack.rollupJobs.rollupIndexPatternsDescription', {
- defaultMessage: `Enable the creation of index patterns which capture rollup indices,
- which in turn enable visualizations based on rollup data. Refresh
- the page to apply the changes.`,
- }),
- category: ['rollups'],
- },
- },
- indexManagement: ['plugins/rollup/legacy'],
- visualize: ['plugins/rollup/legacy'],
- search: ['plugins/rollup/legacy'],
- },
init(server: any) {
const { core: coreSetup, plugins } = server.newPlatform.setup;
- const { usageCollection, metrics, indexManagement } = plugins;
+ const { usageCollection, visTypeTimeseries, indexManagement } = plugins;
const rollupSetup = (plugins.rollup as unknown) as RollupSetup;
@@ -53,7 +29,7 @@ export function rollup(kibana: any) {
rollupPluginInstance.setup(coreSetup, {
usageCollection,
- metrics,
+ visTypeTimeseries,
indexManagement,
__LEGACY: {
plugins: {
diff --git a/x-pack/legacy/plugins/rollup/kibana.json b/x-pack/legacy/plugins/rollup/kibana.json
index 3df8bd7c187d5..78458c9218be3 100644
--- a/x-pack/legacy/plugins/rollup/kibana.json
+++ b/x-pack/legacy/plugins/rollup/kibana.json
@@ -4,7 +4,7 @@
"requiredPlugins": [
"home",
"index_management",
- "metrics",
+ "visTypeTimeseries",
"indexPatternManagement"
],
"optionalPlugins": [
diff --git a/x-pack/legacy/plugins/rollup/public/legacy.ts b/x-pack/legacy/plugins/rollup/public/legacy.ts
deleted file mode 100644
index 83945110c2c76..0000000000000
--- a/x-pack/legacy/plugins/rollup/public/legacy.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { npSetup, npStart } from 'ui/new_platform';
-import { RollupPlugin } from './plugin';
-
-const plugin = new RollupPlugin();
-
-export const setup = plugin.setup(npSetup.core, npSetup.plugins);
-export const start = plugin.start(npStart.core, npStart.plugins);
diff --git a/x-pack/legacy/plugins/rollup/server/plugin.ts b/x-pack/legacy/plugins/rollup/server/plugin.ts
index 5f29ad160e052..05c22b030fff9 100644
--- a/x-pack/legacy/plugins/rollup/server/plugin.ts
+++ b/x-pack/legacy/plugins/rollup/server/plugin.ts
@@ -38,12 +38,12 @@ export class RollupsServerPlugin implements Plugin {
{
__LEGACY: serverShim,
usageCollection,
- metrics,
+ visTypeTimeseries,
indexManagement,
}: {
__LEGACY: ServerShim;
usageCollection?: UsageCollectionSetup;
- metrics?: VisTypeTimeseriesSetup;
+ visTypeTimeseries?: VisTypeTimeseriesSetup;
indexManagement?: IndexManagementPluginSetup;
}
) {
@@ -83,8 +83,8 @@ export class RollupsServerPlugin implements Plugin {
indexManagement.indexDataEnricher.add(rollupDataEnricher);
}
- if (metrics) {
- const { addSearchStrategy } = metrics;
+ if (visTypeTimeseries) {
+ const { addSearchStrategy } = visTypeTimeseries;
registerRollupSearchStrategy(routeDependencies, addSearchStrategy);
}
}
diff --git a/x-pack/legacy/plugins/siem/.gitattributes b/x-pack/legacy/plugins/siem/.gitattributes
index f40e829b65453..a4071d39e63c0 100644
--- a/x-pack/legacy/plugins/siem/.gitattributes
+++ b/x-pack/legacy/plugins/siem/.gitattributes
@@ -1,6 +1,5 @@
# Auto-collapse generated files in GitHub
# https://help.github.com/en/articles/customizing-how-changed-files-appear-on-github
x-pack/legacy/plugins/siem/public/graphql/types.ts linguist-generated=true
-x-pack/legacy/plugins/siem/server/graphql/types.ts linguist-generated=true
x-pack/legacy/plugins/siem/public/graphql/introspection.json linguist-generated=true
diff --git a/x-pack/legacy/plugins/siem/cypress.json b/x-pack/legacy/plugins/siem/cypress.json
deleted file mode 100644
index a0333a1068146..0000000000000
--- a/x-pack/legacy/plugins/siem/cypress.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "baseUrl": "http://localhost:5601",
- "defaultCommandTimeout": 120000,
- "screenshotsFolder": "../../../../target/kibana-siem/cypress/screenshots",
- "trashAssetsBeforeRuns": false,
- "video": false,
- "videosFolder": "../../../../target/kibana-siem/cypress/videos"
-}
diff --git a/x-pack/legacy/plugins/siem/index.ts b/x-pack/legacy/plugins/siem/index.ts
index 3773283555b32..6e03583dda69f 100644
--- a/x-pack/legacy/plugins/siem/index.ts
+++ b/x-pack/legacy/plugins/siem/index.ts
@@ -6,11 +6,10 @@
import { i18n } from '@kbn/i18n';
import { resolve } from 'path';
-import { Server } from 'hapi';
import { Root } from 'joi';
-import { plugin } from './server';
-import { savedObjectMappings } from './server/saved_objects';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { savedObjectMappings } from '../../../plugins/siem/server/saved_objects';
import {
APP_ID,
@@ -23,15 +22,13 @@ import {
DEFAULT_INTERVAL_VALUE,
DEFAULT_FROM,
DEFAULT_TO,
- DEFAULT_SIGNALS_INDEX,
ENABLE_NEWS_FEED_SETTING,
NEWS_FEED_URL_SETTING,
NEWS_FEED_URL_SETTING_DEFAULT,
- SIGNALS_INDEX_KEY,
IP_REPUTATION_LINKS_SETTING,
IP_REPUTATION_LINKS_SETTING_DEFAULT,
-} from './common/constants';
-import { defaultIndexPattern } from './default_index_pattern';
+ DEFAULT_INDEX_PATTERN,
+} from '../../../plugins/siem/common/constants';
import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/utils';
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -102,7 +99,7 @@ export const siem = (kibana: any) => {
name: i18n.translate('xpack.siem.uiSettings.defaultIndexLabel', {
defaultMessage: 'Elasticsearch indices',
}),
- value: defaultIndexPattern,
+ value: DEFAULT_INDEX_PATTERN,
description: i18n.translate('xpack.siem.uiSettings.defaultIndexDescription', {
defaultMessage:
'Comma-delimited list of Elasticsearch indices from which the SIEM app collects events.
',
@@ -162,31 +159,12 @@ export const siem = (kibana: any) => {
},
mappings: savedObjectMappings,
},
- init(server: Server) {
- const { coreContext, env, setup, start } = server.newPlatform;
- const initializerContext = { ...coreContext, env };
- const __legacy = {
- config: server.config,
- route: server.route.bind(server),
- };
-
- // @ts-ignore-next-line: NewPlatform shim is too loosely typed
- const pluginInstance = plugin(initializerContext);
- // @ts-ignore-next-line: NewPlatform shim is too loosely typed
- pluginInstance.setup(setup.core, setup.plugins, __legacy);
- // @ts-ignore-next-line: NewPlatform shim is too loosely typed
- pluginInstance.start(start.core, start.plugins);
- },
config(Joi: Root) {
- // See x-pack/plugins/siem/server/config.ts if you're adding another
- // value where the configuration has to be duplicated at the moment.
- // When we move over to the new platform completely this will be
- // removed and only server/config.ts should be used.
return Joi.object()
.keys({
enabled: Joi.boolean().default(true),
- [SIGNALS_INDEX_KEY]: Joi.string().default(DEFAULT_SIGNALS_INDEX),
})
+ .unknown(true)
.default();
},
});
diff --git a/x-pack/legacy/plugins/siem/package.json b/x-pack/legacy/plugins/siem/package.json
index 472a473842f02..3a93beef963a0 100644
--- a/x-pack/legacy/plugins/siem/package.json
+++ b/x-pack/legacy/plugins/siem/package.json
@@ -1,16 +1,10 @@
{
"author": "Elastic",
- "name": "siem",
+ "name": "siem-legacy-ui",
"version": "8.0.0",
"private": true,
"license": "Elastic-License",
- "scripts": {
- "extract-mitre-attacks": "node scripts/extract_tactics_techniques_mitre.js & node ../../../../scripts/eslint ./public/pages/detection_engine/mitre/mitre_tactics_techniques.ts --fix",
- "build-graphql-types": "node scripts/generate_types_from_graphql.js",
- "cypress:open": "../../../node_modules/.bin/cypress open",
- "cypress:run": "../../../node_modules/.bin/cypress run --spec ./cypress/integration/**/*.spec.ts --reporter ../../../node_modules/cypress-multi-reporters --reporter-options configFile=./reporter_config.json; status=$?; ../../../node_modules/.bin/mochawesome-merge --reportDir ../../../../target/kibana-siem/cypress/results > ../../../../target/kibana-siem/cypress/results/output.json; ../../../../node_modules/.bin/marge ../../../../target/kibana-siem/cypress/results/output.json --reportDir ../../../../target/kibana-siem/cypress/results; mkdir -p ../../../../target/junit && cp ../../../../target/kibana-siem/cypress/results/*.xml ../../../../target/junit/ && exit $status;",
- "cypress:run-as-ci": "node ../../../../scripts/functional_tests --config ../../../test/siem_cypress/config.ts"
- },
+ "scripts": {},
"devDependencies": {
"@types/lodash": "^4.14.110",
"@types/js-yaml": "^3.12.1",
diff --git a/x-pack/legacy/plugins/siem/public/app/app.tsx b/x-pack/legacy/plugins/siem/public/app/app.tsx
index 7413aeab549db..44c1c923cd6ee 100644
--- a/x-pack/legacy/plugins/siem/public/app/app.tsx
+++ b/x-pack/legacy/plugins/siem/public/app/app.tsx
@@ -20,7 +20,7 @@ import { pluck } from 'rxjs/operators';
import { KibanaContextProvider, useKibana, useUiSetting$ } from '../lib/kibana';
import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
-import { DEFAULT_DARK_MODE } from '../../common/constants';
+import { DEFAULT_DARK_MODE } from '../../../../../plugins/siem/common/constants';
import { ErrorToastDispatcher } from '../components/error_toast_dispatcher';
import { compose } from '../lib/compose/kibana_compose';
import { AppFrontendLibs, AppApolloClient } from '../lib/lib';
diff --git a/x-pack/legacy/plugins/siem/public/components/alerts_viewer/index.tsx b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/index.tsx
index 587002c24d526..778adc708d901 100644
--- a/x-pack/legacy/plugins/siem/public/components/alerts_viewer/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/index.tsx
@@ -6,11 +6,11 @@
import React, { useEffect, useCallback, useMemo } from 'react';
import numeral from '@elastic/numeral';
+import { DEFAULT_NUMBER_FORMAT } from '../../../../../../plugins/siem/common/constants';
import { AlertsComponentsQueryProps } from './types';
import { AlertsTable } from './alerts_table';
import * as i18n from './translations';
import { useUiSetting$ } from '../../lib/kibana';
-import { DEFAULT_NUMBER_FORMAT } from '../../../common/constants';
import { MatrixHistogramContainer } from '../matrix_histogram';
import { histogramConfigs } from './histogram_configs';
import { MatrixHisrogramConfigs } from '../matrix_histogram/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx b/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx
index 272c41833f368..635d48cca10fc 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx
@@ -4,15 +4,29 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { shallow, ShallowWrapper } from 'enzyme';
+import { Chart, BarSeries, Axis, ScaleType } from '@elastic/charts';
+import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
+import { mount, ReactWrapper, shallow, ShallowWrapper } from 'enzyme';
import React from 'react';
+import { ThemeProvider } from 'styled-components';
+
+import { escapeDataProviderId } from '../drag_and_drop/helpers';
+import { TestProviders } from '../../mock';
import { BarChartBaseComponent, BarChartComponent } from './barchart';
import { ChartSeriesData } from './common';
-import { Chart, BarSeries, Axis, ScaleType } from '@elastic/charts';
jest.mock('../../lib/kibana');
+jest.mock('uuid', () => {
+ return {
+ v1: jest.fn(() => 'uuid.v1()'),
+ v4: jest.fn(() => 'uuid.v4()'),
+ };
+});
+
+const theme = () => ({ eui: euiDarkVars, darkMode: true });
+
const customHeight = '100px';
const customWidth = '120px';
const chartDataSets = [
@@ -116,6 +130,19 @@ const mockConfig = {
customHeight: 324,
};
+// Suppress warnings about "react-beautiful-dnd"
+/* eslint-disable no-console */
+const originalError = console.error;
+const originalWarn = console.warn;
+beforeAll(() => {
+ console.warn = jest.fn();
+ console.error = jest.fn();
+});
+afterAll(() => {
+ console.error = originalError;
+ console.warn = originalWarn;
+});
+
describe('BarChartBaseComponent', () => {
let shallowWrapper: ShallowWrapper;
const mockBarChartData: ChartSeriesData[] = [
@@ -280,6 +307,91 @@ describe.each(chartDataSets)('BarChart with valid data [%o]', data => {
expect(shallowWrapper.find('BarChartBase')).toHaveLength(1);
expect(shallowWrapper.find('ChartPlaceHolder')).toHaveLength(0);
});
+
+ it('it does NOT render a draggable legend because stackByField is not provided', () => {
+ expect(shallowWrapper.find('[data-test-subj="draggable-legend"]').exists()).toBe(false);
+ });
+});
+
+describe.each(chartDataSets)('BarChart with stackByField', () => {
+ let wrapper: ReactWrapper;
+
+ const data = [
+ {
+ key: 'python.exe',
+ value: [
+ {
+ x: 1586754900000,
+ y: 9675,
+ g: 'python.exe',
+ },
+ ],
+ },
+ {
+ key: 'kernel',
+ value: [
+ {
+ x: 1586754900000,
+ y: 8708,
+ g: 'kernel',
+ },
+ {
+ x: 1586757600000,
+ y: 9282,
+ g: 'kernel',
+ },
+ ],
+ },
+ {
+ key: 'sshd',
+ value: [
+ {
+ x: 1586754900000,
+ y: 5907,
+ g: 'sshd',
+ },
+ ],
+ },
+ ];
+
+ const expectedColors = ['#1EA593', '#2B70F7', '#CE0060'];
+
+ const stackByField = 'process.name';
+
+ beforeAll(() => {
+ wrapper = mount(
+
+
+
+
+
+ );
+ });
+
+ it('it renders a draggable legend', () => {
+ expect(wrapper.find('[data-test-subj="draggable-legend"]').exists()).toBe(true);
+ });
+
+ expectedColors.forEach((color, i) => {
+ test(`it renders the expected legend color ${color} for legend item ${i}`, () => {
+ expect(wrapper.find(`div [color="${color}"]`).exists()).toBe(true);
+ });
+ });
+
+ data.forEach(datum => {
+ test(`it renders the expected draggable legend text for datum ${datum.key}`, () => {
+ const dataProviderId = `draggableId.content.draggable-legend-item-uuid_v4()-${escapeDataProviderId(
+ stackByField
+ )}-${escapeDataProviderId(datum.key)}`;
+
+ expect(
+ wrapper
+ .find(`div [data-rbd-draggable-id="${dataProviderId}"]`)
+ .first()
+ .text()
+ ).toEqual(datum.key);
+ });
+ });
});
describe.each(chartHolderDataSets)('BarChart with invalid data [%o]', data => {
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx b/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
index 2ae0e05850a37..64d15cd6731cb 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
@@ -4,13 +4,19 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import React from 'react';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import React, { useMemo } from 'react';
import { Chart, BarSeries, Axis, Position, ScaleType, Settings } from '@elastic/charts';
import { getOr, get, isNumber } from 'lodash/fp';
import deepmerge from 'deepmerge';
+import uuid from 'uuid';
+import styled from 'styled-components';
-import { useThrottledResizeObserver } from '../utils';
+import { escapeDataProviderId } from '../drag_and_drop/helpers';
import { useTimeZone } from '../../lib/kibana';
+import { defaultLegendColors } from '../matrix_histogram/utils';
+import { useThrottledResizeObserver } from '../utils';
+
import { ChartPlaceHolder } from './chart_place_holder';
import {
chartDefaultSettings,
@@ -22,6 +28,12 @@ import {
WrappedByAutoSizer,
useTheme,
} from './common';
+import { DraggableLegend } from './draggable_legend';
+import { LegendItem } from './draggable_legend_item';
+
+const LegendFlexItem = styled(EuiFlexItem)`
+ overview: hidden;
+`;
const checkIfAllTheDataInTheSeriesAreValid = (series: ChartSeriesData): series is ChartSeriesData =>
series != null &&
@@ -38,12 +50,14 @@ const checkIfAnyValidSeriesExist = (
// Bar chart rotation: https://ela.st/chart-rotations
export const BarChartBaseComponent = ({
data,
+ forceHiddenLegend = false,
...chartConfigs
}: {
data: ChartSeriesData[];
width: string | null | undefined;
height: string | null | undefined;
configs?: ChartSeriesConfigs | undefined;
+ forceHiddenLegend?: boolean;
}) => {
const theme = useTheme();
const timeZone = useTimeZone();
@@ -59,10 +73,10 @@ export const BarChartBaseComponent = ({
return chartConfigs.width && chartConfigs.height ? (
-
+
{data.map(series => {
const barSeriesKey = series.key;
- return checkIfAllTheDataInTheSeriesAreValid ? (
+ return checkIfAllTheDataInTheSeriesAreValid(series) ? (
= ({ barChart, configs }) => {
+const NO_LEGEND_DATA: LegendItem[] = [];
+
+export const BarChartComponent: React.FC = ({
+ barChart,
+ configs,
+ stackByField,
+}) => {
const { ref: measureRef, width, height } = useThrottledResizeObserver();
+ const legendItems: LegendItem[] = useMemo(
+ () =>
+ barChart != null && stackByField != null
+ ? barChart.map((d, i) => ({
+ color: d.color ?? i < defaultLegendColors.length ? defaultLegendColors[i] : undefined,
+ dataProviderId: escapeDataProviderId(
+ `draggable-legend-item-${uuid.v4()}-${stackByField}-${d.key}`
+ ),
+ field: stackByField,
+ value: d.key,
+ }))
+ : NO_LEGEND_DATA,
+ [barChart, stackByField]
+ );
+
const customHeight = get('customHeight', configs);
const customWidth = get('customWidth', configs);
const chartHeight = getChartHeight(customHeight, height);
const chartWidth = getChartWidth(customWidth, width);
return checkIfAnyValidSeriesExist(barChart) ? (
-
-
-
+
+
+
+
+
+
+
+
+
+
) : (
);
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/common.tsx b/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
index d8429cba1b4fb..c7b40c50ffde8 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
@@ -19,8 +19,8 @@ import {
import React, { useMemo } from 'react';
import styled from 'styled-components';
+import { DEFAULT_DARK_MODE } from '../../../../../../plugins/siem/common/constants';
import { useUiSetting } from '../../lib/kibana';
-import { DEFAULT_DARK_MODE } from '../../../common/constants';
export const defaultChartHeight = '100%';
export const defaultChartWidth = '100%';
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/draggable_legend.test.tsx b/x-pack/legacy/plugins/siem/public/components/charts/draggable_legend.test.tsx
new file mode 100644
index 0000000000000..0da0c2bdc35f2
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/charts/draggable_legend.test.tsx
@@ -0,0 +1,149 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
+import { mount, ReactWrapper } from 'enzyme';
+import React from 'react';
+import { ThemeProvider } from 'styled-components';
+
+import { TestProviders } from '../../mock';
+
+import { MIN_LEGEND_HEIGHT, DraggableLegend } from './draggable_legend';
+import { LegendItem } from './draggable_legend_item';
+
+const theme = () => ({ eui: euiDarkVars, darkMode: true });
+
+const allOthersDataProviderId =
+ 'draggable-legend-item-527adabe-8e1c-4a1f-965c-2f3d65dda9e1-event_dataset-All others';
+
+const legendItems: LegendItem[] = [
+ {
+ color: '#1EA593',
+ dataProviderId: 'draggable-legend-item-3207fda7-d008-402a-86a0-8ad632081bad-event_dataset-flow',
+ field: 'event.dataset',
+ value: 'flow',
+ },
+ {
+ color: '#2B70F7',
+ dataProviderId:
+ 'draggable-legend-item-83f6c824-811d-4ec8-b373-eba2b0de6398-event_dataset-suricata_eve',
+ field: 'event.dataset',
+ value: 'suricata.eve',
+ },
+ {
+ color: '#CE0060',
+ dataProviderId:
+ 'draggable-legend-item-ec57bb8f-82cd-4e07-bd38-1d11b3f0ee5f-event_dataset-traefik_access',
+ field: 'event.dataset',
+ value: 'traefik.access',
+ },
+ {
+ color: '#38007E',
+ dataProviderId:
+ 'draggable-legend-item-25d5fcd6-87ba-46b5-893e-c655d7d504e3-event_dataset-esensor',
+ field: 'event.dataset',
+ value: 'esensor',
+ },
+ {
+ color: '#F37020',
+ dataProviderId: allOthersDataProviderId,
+ field: 'event.dataset',
+ value: 'All others',
+ },
+];
+
+describe('DraggableLegend', () => {
+ const height = 400;
+
+ // Suppress warnings about "react-beautiful-dnd"
+ /* eslint-disable no-console */
+ const originalError = console.error;
+ const originalWarn = console.warn;
+ beforeAll(() => {
+ console.warn = jest.fn();
+ console.error = jest.fn();
+ });
+ afterAll(() => {
+ console.error = originalError;
+ console.warn = originalWarn;
+ });
+
+ describe('rendering', () => {
+ let wrapper: ReactWrapper;
+
+ beforeEach(() => {
+ wrapper = mount(
+
+
+
+
+
+ );
+ });
+
+ it(`renders a container with the specified non-zero 'height'`, () => {
+ expect(wrapper.find('[data-test-subj="draggable-legend"]').first()).toHaveStyleRule(
+ 'height',
+ `${height}px`
+ );
+ });
+
+ it('scrolls when necessary', () => {
+ expect(wrapper.find('[data-test-subj="draggable-legend"]').first()).toHaveStyleRule(
+ 'overflow',
+ 'auto'
+ );
+ });
+
+ it('renders the legend items', () => {
+ legendItems.forEach(item =>
+ expect(
+ wrapper
+ .find(
+ item.dataProviderId !== allOthersDataProviderId
+ ? `[data-test-subj="legend-item-${item.dataProviderId}"]`
+ : '[data-test-subj="all-others-legend-item"]'
+ )
+ .first()
+ .text()
+ ).toEqual(item.value)
+ );
+ });
+
+ it('renders a spacer for every legend item', () => {
+ expect(wrapper.find('[data-test-subj="draggable-legend-spacer"]').hostNodes().length).toEqual(
+ legendItems.length
+ );
+ });
+ });
+
+ it('does NOT render the legend when an empty collection of legendItems is provided', () => {
+ const wrapper = mount(
+
+
+
+
+
+ );
+
+ expect(wrapper.find('[data-test-subj="draggable-legend"]').exists()).toBe(false);
+ });
+
+ it(`renders a legend with the minimum height when 'height' is zero`, () => {
+ const wrapper = mount(
+
+
+
+
+
+ );
+
+ expect(wrapper.find('[data-test-subj="draggable-legend"]').first()).toHaveStyleRule(
+ 'height',
+ `${MIN_LEGEND_HEIGHT}px`
+ );
+ });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/draggable_legend.tsx b/x-pack/legacy/plugins/siem/public/components/charts/draggable_legend.tsx
new file mode 100644
index 0000000000000..ef3fbb8780d15
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/charts/draggable_legend.tsx
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
+import { rgba } from 'polished';
+import React from 'react';
+import styled from 'styled-components';
+
+import { DraggableLegendItem, LegendItem } from './draggable_legend_item';
+
+export const MIN_LEGEND_HEIGHT = 175;
+
+const DraggableLegendContainer = styled.div<{ height: number }>`
+ height: ${({ height }) => `${height}px`};
+ overflow: auto;
+ scrollbar-width: thin;
+ width: 165px;
+
+ &::-webkit-scrollbar {
+ height: ${({ theme }) => theme.eui.euiScrollBar};
+ width: ${({ theme }) => theme.eui.euiScrollBar};
+ }
+
+ &::-webkit-scrollbar-thumb {
+ background-clip: content-box;
+ background-color: ${({ theme }) => rgba(theme.eui.euiColorDarkShade, 0.5)};
+ border: ${({ theme }) => theme.eui.euiScrollBarCorner} solid transparent;
+ }
+
+ &::-webkit-scrollbar-corner,
+ &::-webkit-scrollbar-track {
+ background-color: transparent;
+ }
+`;
+
+const DraggableLegendComponent: React.FC<{
+ height: number;
+ legendItems: LegendItem[];
+}> = ({ height, legendItems }) => {
+ if (legendItems.length === 0) {
+ return null;
+ }
+
+ return (
+
+
+
+ {legendItems.map(item => (
+
+
+
+
+ ))}
+
+
+
+ );
+};
+
+DraggableLegendComponent.displayName = 'DraggableLegendComponent';
+
+export const DraggableLegend = React.memo(DraggableLegendComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/draggable_legend_item.test.tsx b/x-pack/legacy/plugins/siem/public/components/charts/draggable_legend_item.test.tsx
new file mode 100644
index 0000000000000..581952a8415f6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/charts/draggable_legend_item.test.tsx
@@ -0,0 +1,143 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
+import { mount, ReactWrapper } from 'enzyme';
+import React from 'react';
+import { ThemeProvider } from 'styled-components';
+
+import { TestProviders } from '../../mock';
+
+import { DraggableLegendItem, LegendItem } from './draggable_legend_item';
+
+const theme = () => ({ eui: euiDarkVars, darkMode: true });
+
+describe('DraggableLegendItem', () => {
+ // Suppress warnings about "react-beautiful-dnd"
+ /* eslint-disable no-console */
+ const originalError = console.error;
+ const originalWarn = console.warn;
+ beforeAll(() => {
+ console.warn = jest.fn();
+ console.error = jest.fn();
+ });
+ afterAll(() => {
+ console.error = originalError;
+ console.warn = originalWarn;
+ });
+
+ describe('rendering a regular (non "All others") legend item', () => {
+ const legendItem: LegendItem = {
+ color: '#1EA593',
+ dataProviderId:
+ 'draggable-legend-item-3207fda7-d008-402a-86a0-8ad632081bad-event_dataset-flow',
+ field: 'event.dataset',
+ value: 'flow',
+ };
+
+ let wrapper: ReactWrapper;
+
+ beforeEach(() => {
+ wrapper = mount(
+
+
+
+
+
+ );
+ });
+
+ it('renders a colored circle with the expected legend item color', () => {
+ expect(
+ wrapper
+ .find('[data-test-subj="legend-color"]')
+ .first()
+ .props().color
+ ).toEqual(legendItem.color);
+ });
+
+ it('renders draggable legend item text', () => {
+ expect(
+ wrapper
+ .find(`[data-test-subj="legend-item-${legendItem.dataProviderId}"]`)
+ .first()
+ .text()
+ ).toEqual(legendItem.value);
+ });
+
+ it('does NOT render a non-draggable "All others" legend item', () => {
+ expect(wrapper.find(`[data-test-subj="all-others-legend-item"]`).exists()).toBe(false);
+ });
+ });
+
+ describe('rendering an "All others" legend item', () => {
+ const allOthersLegendItem: LegendItem = {
+ color: '#F37020',
+ dataProviderId:
+ 'draggable-legend-item-527adabe-8e1c-4a1f-965c-2f3d65dda9e1-event_dataset-All others',
+ field: 'event.dataset',
+ value: 'All others',
+ };
+
+ let wrapper: ReactWrapper;
+
+ beforeEach(() => {
+ wrapper = mount(
+
+
+
+
+
+ );
+ });
+
+ it('renders a colored circle with the expected legend item color', () => {
+ expect(
+ wrapper
+ .find('[data-test-subj="legend-color"]')
+ .first()
+ .props().color
+ ).toEqual(allOthersLegendItem.color);
+ });
+
+ it('does NOT render a draggable legend item', () => {
+ expect(
+ wrapper
+ .find(`[data-test-subj="legend-item-${allOthersLegendItem.dataProviderId}"]`)
+ .exists()
+ ).toBe(false);
+ });
+
+ it('renders NON-draggable `All others` legend item text', () => {
+ expect(
+ wrapper
+ .find(`[data-test-subj="all-others-legend-item"]`)
+ .first()
+ .text()
+ ).toEqual(allOthersLegendItem.value);
+ });
+ });
+
+ it('does NOT render a colored circle when the legend item has no color', () => {
+ const noColorLegendItem: LegendItem = {
+ // no `color` attribute for this `LegendItem`!
+ dataProviderId:
+ 'draggable-legend-item-3207fda7-d008-402a-86a0-8ad632081bad-event_dataset-flow',
+ field: 'event.dataset',
+ value: 'flow',
+ };
+
+ const wrapper = mount(
+
+
+
+
+
+ );
+
+ expect(wrapper.find('[data-test-subj="legend-color"]').exists()).toBe(false);
+ });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/draggable_legend_item.tsx b/x-pack/legacy/plugins/siem/public/components/charts/draggable_legend_item.tsx
new file mode 100644
index 0000000000000..cdda1733932d5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/charts/draggable_legend_item.tsx
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiHealth, EuiText } from '@elastic/eui';
+import React from 'react';
+import styled from 'styled-components';
+
+import { DefaultDraggable } from '../draggables';
+
+import * as i18n from './translation';
+
+// The "All others" legend item is not draggable
+const AllOthers = styled.span`
+ padding-left: 7px;
+`;
+
+export interface LegendItem {
+ color?: string;
+ dataProviderId: string;
+ field: string;
+ value: string;
+}
+
+const DraggableLegendItemComponent: React.FC<{
+ legendItem: LegendItem;
+}> = ({ legendItem }) => {
+ const { color, dataProviderId, field, value } = legendItem;
+
+ return (
+
+
+ {color != null && (
+
+
+
+ )}
+
+
+ {value !== i18n.ALL_OTHERS ? (
+
+ ) : (
+ <>
+ {value}
+
+ )}
+
+
+
+ );
+};
+
+DraggableLegendItemComponent.displayName = 'DraggableLegendItemComponent';
+
+export const DraggableLegendItem = React.memo(DraggableLegendItemComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/translation.ts b/x-pack/legacy/plugins/siem/public/components/charts/translation.ts
index 341cb7782f87c..891f59fc97bd1 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/translation.ts
+++ b/x-pack/legacy/plugins/siem/public/components/charts/translation.ts
@@ -13,3 +13,7 @@ export const ALL_VALUES_ZEROS_TITLE = i18n.translate('xpack.siem.chart.dataAllVa
export const DATA_NOT_AVAILABLE_TITLE = i18n.translate('xpack.siem.chart.dataNotAvailableTitle', {
defaultMessage: 'Chart Data Not Available',
});
+
+export const ALL_OTHERS = i18n.translate('xpack.siem.chart.allOthersGroupingLabel', {
+ defaultMessage: 'All others',
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.tsx
index 11db33fff6d72..248ae671550ef 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.tsx
@@ -27,6 +27,9 @@ import {
draggableIsField,
} from './helpers';
+// @ts-ignore
+window['__react-beautiful-dnd-disable-dev-warnings'] = true;
+
interface Props {
browserFields: BrowserFields;
children: React.ReactNode;
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx
index 11891afabbf3d..cd9e1dc95ff01 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx
@@ -7,12 +7,13 @@
import { shallow } from 'enzyme';
import React from 'react';
import { MockedProvider } from 'react-apollo/test-utils';
+import { DraggableStateSnapshot, DraggingStyle } from 'react-beautiful-dnd';
import { mockBrowserFields, mocksSource } from '../../containers/source/mock';
import { TestProviders } from '../../mock';
import { mockDataProviders } from '../timeline/data_providers/mock/mock_data_providers';
import { DragDropContextWrapper } from './drag_drop_context_wrapper';
-import { DraggableWrapper, ConditionalPortal } from './draggable_wrapper';
+import { ConditionalPortal, DraggableWrapper, getStyle } from './draggable_wrapper';
import { useMountAppended } from '../../utils/use_mount_appended';
describe('DraggableWrapper', () => {
@@ -48,6 +49,36 @@ describe('DraggableWrapper', () => {
expect(wrapper.text()).toEqual(message);
});
+
+ test('it does NOT render hover actions when the mouse is NOT over the draggable wrapper', () => {
+ const wrapper = mount(
+
+
+
+ message} />
+
+
+
+ );
+
+ expect(wrapper.find('[data-test-subj="copy-to-clipboard"]').exists()).toBe(false);
+ });
+
+ test('it renders hover actions when the mouse is over the draggable wrapper', () => {
+ const wrapper = mount(
+
+
+
+ message} />
+
+
+
+ );
+
+ wrapper.simulate('mouseenter');
+ wrapper.update();
+ expect(wrapper.find('[data-test-subj="copy-to-clipboard"]').exists()).toBe(true);
+ });
});
describe('text truncation styling', () => {
@@ -100,4 +131,36 @@ describe('ConditionalPortal', () => {
expect(props.registerProvider.mock.calls.length).toEqual(1);
});
+
+ describe('getStyle', () => {
+ const style: DraggingStyle = {
+ boxSizing: 'border-box',
+ height: 10,
+ left: 1,
+ pointerEvents: 'none',
+ position: 'fixed',
+ transition: 'none',
+ top: 123,
+ width: 50,
+ zIndex: 9999,
+ };
+
+ it('returns a style with no transitionDuration when the snapshot is not drop animating', () => {
+ const snapshot: DraggableStateSnapshot = {
+ isDragging: true,
+ isDropAnimating: false, // <-- NOT drop animating
+ };
+
+ expect(getStyle(style, snapshot)).not.toHaveProperty('transitionDuration');
+ });
+
+ it('returns a style with a transitionDuration when the snapshot is drop animating', () => {
+ const snapshot: DraggableStateSnapshot = {
+ isDragging: true,
+ isDropAnimating: true, // <-- it is drop animating
+ };
+
+ expect(getStyle(style, snapshot)).toHaveProperty('transitionDuration', '0.00000001s');
+ });
+ });
});
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx
index 3a6a4de7984db..c7da5b5c58951 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx
@@ -4,12 +4,14 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
import {
Draggable,
DraggableProvided,
DraggableStateSnapshot,
+ DraggingStyle,
Droppable,
+ NotDraggingStyle,
} from 'react-beautiful-dnd';
import { useDispatch } from 'react-redux';
import styled from 'styled-components';
@@ -18,6 +20,9 @@ import deepEqual from 'fast-deep-equal';
import { dragAndDropActions } from '../../store/drag_and_drop';
import { DataProvider } from '../timeline/data_providers/data_provider';
import { TruncatableText } from '../truncatable_text';
+import { WithHoverActions } from '../with_hover_actions';
+
+import { DraggableWrapperHoverContent } from './draggable_wrapper_hover_content';
import { getDraggableId, getDroppableId } from './helpers';
import { ProviderContainer } from './provider_container';
@@ -67,23 +72,42 @@ type RenderFunctionProp = (
state: DraggableStateSnapshot
) => React.ReactNode;
-interface OwnProps {
+interface Props {
dataProvider: DataProvider;
inline?: boolean;
render: RenderFunctionProp;
truncate?: boolean;
+ onFilterAdded?: () => void;
}
-type Props = OwnProps;
-
/**
* Wraps a draggable component to handle registration / unregistration of the
* data provider associated with the item being dropped
*/
+export const getStyle = (
+ style: DraggingStyle | NotDraggingStyle | undefined,
+ snapshot: DraggableStateSnapshot
+) => {
+ if (!snapshot.isDropAnimating) {
+ return style;
+ }
+
+ return {
+ ...style,
+ transitionDuration: '0.00000001s', // cannot be 0, but can be a very short duration
+ };
+};
+
export const DraggableWrapper = React.memo(
- ({ dataProvider, render, truncate }) => {
+ ({ dataProvider, onFilterAdded, render, truncate }) => {
+ const [showTopN, setShowTopN] = useState(false);
+ const toggleTopN = useCallback(() => {
+ setShowTopN(!showTopN);
+ }, [setShowTopN, showTopN]);
+
const [providerRegistered, setProviderRegistered] = useState(false);
+
const dispatch = useDispatch();
const registerProvider = useCallback(() => {
@@ -105,65 +129,90 @@ export const DraggableWrapper = React.memo(
[]
);
- return (
-
-
- (
-
-
-
(
+
+ ),
+ [dataProvider, onFilterAdded, showTopN, toggleTopN]
+ );
+
+ const renderContent = useCallback(
+ () => (
+
+
+ (
+
+
- {render(dataProvider, provided, snapshot)}
-
-
-
- )}
- >
- {droppableProvided => (
-
-
- {(provided, snapshot) => (
-
- {truncate && !snapshot.isDragging ? (
-
- {render(dataProvider, provided, snapshot)}
-
- ) : (
-
- {render(dataProvider, provided, snapshot)}
-
- )}
-
- )}
-
- {droppableProvided.placeholder}
-
+
+
+ {(provided, snapshot) => (
+
+ {truncate && !snapshot.isDragging ? (
+
+ {render(dataProvider, provided, snapshot)}
+
+ ) : (
+
+ {render(dataProvider, provided, snapshot)}
+
+ )}
+
+ )}
+
+ {droppableProvided.placeholder}
+
Test title
+
diff --git a/x-pack/legacy/plugins/siem/public/components/header_section/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/header_section/index.test.tsx
index bc4692b6fe0c5..e61b39691203c 100644
--- a/x-pack/legacy/plugins/siem/public/components/header_section/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/header_section/index.test.tsx
@@ -48,7 +48,7 @@ describe('HeaderSection', () => {
).toBe(true);
});
- test('it DOES NOT render the subtitle when not provided', () => {
+ test('renders the subtitle when not provided (to prevent layout thrash)', () => {
const wrapper = mount(
@@ -60,7 +60,7 @@ describe('HeaderSection', () => {
.find('[data-test-subj="header-section-subtitle"]')
.first()
.exists()
- ).toBe(false);
+ ).toBe(true);
});
test('it renders supplements when children provided', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/header_section/index.tsx b/x-pack/legacy/plugins/siem/public/components/header_section/index.tsx
index 3153e785a8a32..43245121dd393 100644
--- a/x-pack/legacy/plugins/siem/public/components/header_section/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/header_section/index.tsx
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { EuiFlexGroup, EuiFlexItem, EuiIconTip, EuiTitle } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiIconTip, EuiTitle, EuiTitleSize } from '@elastic/eui';
import React from 'react';
import styled, { css } from 'styled-components';
@@ -36,6 +36,7 @@ export interface HeaderSectionProps extends HeaderProps {
split?: boolean;
subtitle?: string | React.ReactNode;
title: string | React.ReactNode;
+ titleSize?: EuiTitleSize;
tooltip?: string;
}
@@ -46,6 +47,7 @@ const HeaderSectionComponent: React.FC = ({
split,
subtitle,
title,
+ titleSize = 'm',
tooltip,
}) => (
@@ -53,7 +55,7 @@ const HeaderSectionComponent: React.FC = ({
-
+
{title}
{tooltip && (
@@ -65,7 +67,7 @@ const HeaderSectionComponent: React.FC = ({
- {subtitle && }
+
{id && (
diff --git a/x-pack/legacy/plugins/siem/public/components/links/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/links/index.test.tsx
index d2d1d6569854d..214c0294f2cf4 100644
--- a/x-pack/legacy/plugins/siem/public/components/links/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/links/index.test.tsx
@@ -24,6 +24,8 @@ import {
ExternalLink,
} from '.';
+jest.mock('../../pages/overview/events_by_dataset');
+
jest.mock('../../lib/kibana', () => {
return {
useUiSetting$: jest.fn(),
diff --git a/x-pack/legacy/plugins/siem/public/components/links/index.tsx b/x-pack/legacy/plugins/siem/public/components/links/index.tsx
index 62a67af6e08b1..45225e31e9ac8 100644
--- a/x-pack/legacy/plugins/siem/public/components/links/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/links/index.tsx
@@ -6,9 +6,10 @@
import { EuiLink, EuiToolTip, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import React, { useMemo } from 'react';
-
import { isNil } from 'lodash/fp';
import styled from 'styled-components';
+
+import { IP_REPUTATION_LINKS_SETTING } from '../../../../../../plugins/siem/common/constants';
import {
DefaultFieldRendererOverflow,
DEFAULT_MORE_MAX_HEIGHT,
@@ -22,7 +23,6 @@ import {
} from '../link_to';
import { FlowTarget, FlowTargetSourceDest } from '../../graphql/types';
import { useUiSetting$ } from '../../lib/kibana';
-import { IP_REPUTATION_LINKS_SETTING } from '../../../common/constants';
import { isUrlInvalid } from '../../pages/detection_engine/rules/components/step_about_rule/helpers';
import { ExternalLinkIcon } from '../external_link_icon';
import { navTabs } from '../../pages/home/home_navigations';
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/__snapshots__/index.test.tsx.snap
index 0e518e48e2e88..5aa846d15b684 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/__snapshots__/index.test.tsx.snap
@@ -1,5 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`Matrix Histogram Component not initial load it renders no MatrixLoader 1`] = `""`;
+exports[`Matrix Histogram Component not initial load it renders no MatrixLoader 1`] = `""`;
-exports[`Matrix Histogram Component on initial load it renders MatrixLoader 1`] = `""`;
+exports[`Matrix Histogram Component on initial load it renders MatrixLoader 1`] = `""`;
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx
index db5b1f7f03ee3..3b8a43a0f395a 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx
@@ -87,6 +87,17 @@ describe('Matrix Histogram Component', () => {
});
});
+ describe('spacer', () => {
+ test('it renders a spacer by default', () => {
+ expect(wrapper.find('[data-test-subj="spacer"]').exists()).toBe(true);
+ });
+
+ test('it does NOT render a spacer when showSpacer is false', () => {
+ wrapper = mount();
+ expect(wrapper.find('[data-test-subj="spacer"]').exists()).toBe(false);
+ });
+ });
+
describe('not initial load', () => {
beforeAll(() => {
(useQuery as jest.Mock).mockReturnValue({
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.tsx b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.tsx
index 12a474009dc5b..3d4eebd68319c 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.tsx
@@ -37,6 +37,7 @@ import {
import { SetQuery } from '../../pages/hosts/navigation/types';
import { QueryTemplateProps } from '../../containers/query_template';
import { setAbsoluteRangeDatePicker } from '../../store/inputs/actions';
+import { InputsModelId } from '../../store/inputs/constants';
import { HistogramType } from '../../graphql/types';
export interface OwnProps extends QueryTemplateProps {
@@ -46,9 +47,12 @@ export interface OwnProps extends QueryTemplateProps {
hideHistogramIfEmpty?: boolean;
histogramType: HistogramType;
id: string;
+ indexToAdd?: string[] | null;
legendPosition?: Position;
mapping?: MatrixHistogramMappingTypes;
+ showSpacer?: boolean;
setQuery: SetQuery;
+ setAbsoluteRangeDatePickerTarget?: InputsModelId;
showLegend?: boolean;
stackByOptions: MatrixHistogramOption[];
subtitle?: string | GetSubTitle;
@@ -62,6 +66,7 @@ const HeaderChildrenFlexItem = styled(EuiFlexItem)`
margin-left: 24px;
`;
+// @ts-ignore - the EUI type definitions for Panel do no play nice with styled-components
const HistogramPanel = styled(Panel)<{ height?: number }>`
display: flex;
flex-direction: column;
@@ -79,16 +84,20 @@ export const MatrixHistogramComponent: React.FC {
@@ -100,7 +109,11 @@ export const MatrixHistogramComponent: React.FC {
- dispatchSetAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
+ dispatchSetAbsoluteRangeDatePicker({
+ id: setAbsoluteRangeDatePickerTarget,
+ from: min,
+ to: max,
+ });
},
yTickFormatter,
showLegend,
@@ -122,7 +135,7 @@ export const MatrixHistogramComponent: React.FC) => {
setSelectedStackByOption(
- stackByOptions?.find(co => co.value === event.target.value) ?? defaultStackByOption
+ stackByOptions.find(co => co.value === event.target.value) ?? defaultStackByOption
);
},
[]
@@ -134,6 +147,7 @@ export const MatrixHistogramComponent: React.FC (title != null && typeof title === 'function' ? title(selectedStackByOption) : title),
[title, selectedStackByOption]
);
- const subtitleWithCounts = useMemo(
- () => (subtitle != null && typeof subtitle === 'function' ? subtitle(totalCount) : subtitle),
- [subtitle, totalCount]
- );
+ const subtitleWithCounts = useMemo(() => {
+ if (isInitialLoading) {
+ return null;
+ }
+
+ if (typeof subtitle === 'function') {
+ return totalCount >= 0 ? subtitle(totalCount) : null;
+ }
+
+ return subtitle;
+ }, [isInitialLoading, subtitle, totalCount]);
const hideHistogram = useMemo(() => (totalCount <= 0 && hideHistogramIfEmpty ? true : false), [
totalCount,
hideHistogramIfEmpty,
@@ -155,7 +176,9 @@ export const MatrixHistogramComponent: React.FC getCustomChartData(data, mapping), [data, mapping]);
useEffect(() => {
- setQuery({ id, inspect, loading, refetch });
+ if (!loading && !isInitialLoading) {
+ setQuery({ id, inspect, loading, refetch });
+ }
if (isInitialLoading && !!barChartData && data) {
setIsInitialLoading(false);
@@ -189,59 +212,39 @@ export const MatrixHistogramComponent: React.FC
)}
+
+
+
+ {stackByOptions.length > 1 && (
+
+ )}
+
+ {headerChildren}
+
+
+
{isInitialLoading ? (
- <>
- = 0 ? subtitleWithCounts : null)}
- >
-
-
- {stackByOptions?.length > 1 && (
-
- )}
-
- {headerChildren}
-
-
-
-
+
) : (
- <>
- = 0 ? subtitleWithCounts : null)
- }
- >
-
-
- {stackByOptions?.length > 1 && (
-
- )}
-
- {headerChildren}
-
-
-
-
+
)}
-
+ {showSpacer && }
);
};
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/types.ts b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/types.ts
index a435c7be6c890..98437845a3ab7 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/types.ts
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/types.ts
@@ -4,9 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { EuiTitleSize } from '@elastic/eui';
import { ScaleType, Position, TickFormatter } from '@elastic/charts';
import { ActionCreator } from 'redux';
-import { ESQuery } from '../../../common/typed_json';
+import { ESQuery } from '../../../../../../plugins/siem/common/typed_json';
import { SetQuery } from '../../pages/hosts/navigation/types';
import { InputsModelId } from '../../store/inputs/constants';
import { HistogramType } from '../../graphql/types';
@@ -34,6 +35,7 @@ export interface MatrixHisrogramConfigs {
stackByOptions: MatrixHistogramOption[];
subtitle?: string | GetSubTitle;
title: string | GetTitle;
+ titleSize?: EuiTitleSize;
}
interface MatrixHistogramBasicProps {
@@ -57,14 +59,22 @@ interface MatrixHistogramBasicProps {
stackByOptions: MatrixHistogramOption[];
subtitle?: string | GetSubTitle;
title?: string | GetTitle;
+ titleSize?: EuiTitleSize;
}
export interface MatrixHistogramQueryProps {
endDate: number;
errorMessage: string;
filterQuery?: ESQuery | string | undefined;
+ setAbsoluteRangeDatePicker?: ActionCreator<{
+ id: InputsModelId;
+ from: number;
+ to: number;
+ }>;
+ setAbsoluteRangeDatePickerTarget?: InputsModelId;
stackByField: string;
startDate: number;
+ indexToAdd?: string[] | null;
isInspected: boolean;
histogramType: HistogramType;
}
@@ -73,6 +83,7 @@ export interface MatrixHistogramProps extends MatrixHistogramBasicProps {
scaleType?: ScaleType;
yTickFormatter?: (value: number) => string;
showLegend?: boolean;
+ showSpacer?: boolean;
legendPosition?: Position;
}
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts
index ddac615cef50a..d31eb1da15ea1 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts
@@ -69,6 +69,19 @@ export const getBarchartConfigs = ({
customHeight: chartHeight ?? DEFAULT_CHART_HEIGHT,
});
+export const defaultLegendColors = [
+ '#1EA593',
+ '#2B70F7',
+ '#CE0060',
+ '#38007E',
+ '#FCA5D3',
+ '#F37020',
+ '#E49E29',
+ '#B0916F',
+ '#7B000B',
+ '#34130C',
+];
+
export const formatToChartDataItem = ([key, value]: [
string,
MatrixOverTimeHistogramData[]
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts b/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts
index c4ca7dc203619..cebfc172ee6ff 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts
@@ -5,6 +5,8 @@
*/
import { useState, useEffect } from 'react';
+
+import { DEFAULT_ANOMALY_SCORE } from '../../../../../../../plugins/siem/common/constants';
import { anomaliesTableData } from '../api/anomalies_table_data';
import { InfluencerInput, Anomalies, CriteriaFields } from '../types';
import { hasMlUserPermissions } from '../permissions/has_ml_user_permissions';
@@ -14,7 +16,6 @@ import { useStateToaster, errorToToaster } from '../../toasters';
import * as i18n from './translations';
import { useTimeZone, useUiSetting$ } from '../../../lib/kibana';
-import { DEFAULT_ANOMALY_SCORE } from '../../../../common/constants';
interface Args {
influencers?: InfluencerInput[];
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/create_description_list.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/create_description_list.tsx
index e0f3ea162ee78..24f203a3682d5 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/create_description_list.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/create_description_list.tsx
@@ -7,11 +7,12 @@
import { EuiText, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
import React from 'react';
import styled from 'styled-components';
+
+import { DescriptionList } from '../../../../../../../plugins/siem/common/utility_types';
import { Anomaly, NarrowDateRange } from '../types';
import { getScoreString } from './score_health';
import { PreferenceFormattedDate } from '../../formatted_date';
import { createInfluencers } from './../influencers/create_influencers';
-import { DescriptionList } from '../../../../common/utility_types';
import * as i18n from './translations';
import { createExplorerLink } from '../links/create_explorer_link';
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx
index 9a82859066f54..bc488ee00988b 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx
@@ -6,12 +6,12 @@
import { useEffect, useState } from 'react';
+import { DEFAULT_INDEX_KEY } from '../../../../../../../plugins/siem/common/constants';
import { checkRecognizer, getJobsSummary, getModules } from '../api';
import { SiemJob } from '../types';
import { hasMlUserPermissions } from '../../ml/permissions/has_ml_user_permissions';
import { errorToToaster, useStateToaster } from '../../toasters';
import { useUiSetting$ } from '../../../lib/kibana';
-import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
import * as i18n from './translations';
import { createSiemJobs } from './use_siem_jobs_helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx
index a0e0c70d2f204..a0343608dc67a 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx
@@ -7,12 +7,12 @@
import styled from 'styled-components';
import React, { useState, useCallback } from 'react';
import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiSwitch } from '@elastic/eui';
-import { SiemJob } from '../types';
import {
isJobLoading,
isJobFailed,
isJobStarted,
-} from '../../../../common/detection_engine/ml_helpers';
+} from '../../../../../../../plugins/siem/common/detection_engine/ml_helpers';
+import { SiemJob } from '../types';
const StaticSwitch = styled(EuiSwitch)`
.euiSwitch__thumb,
diff --git a/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.ts b/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.ts
index 155f63145ca95..5407eba8b5b29 100644
--- a/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.ts
+++ b/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.ts
@@ -7,7 +7,7 @@
import { getOr, omit } from 'lodash/fp';
import { ChromeBreadcrumb } from '../../../../../../../../src/core/public';
-import { APP_NAME } from '../../../../common/constants';
+import { APP_NAME } from '../../../../../../../plugins/siem/common/constants';
import { StartServices } from '../../../plugin';
import { getBreadcrumbs as getHostDetailsBreadcrumbs } from '../../../pages/hosts/details/utils';
import { getBreadcrumbs as getIPDetailsBreadcrumbs } from '../../../pages/network/ip_details';
diff --git a/x-pack/legacy/plugins/siem/public/components/news_feed/helpers.test.ts b/x-pack/legacy/plugins/siem/public/components/news_feed/helpers.test.ts
index e7cd03d098da8..686ec4e86e785 100644
--- a/x-pack/legacy/plugins/siem/public/components/news_feed/helpers.test.ts
+++ b/x-pack/legacy/plugins/siem/public/components/news_feed/helpers.test.ts
@@ -4,8 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { NEWS_FEED_URL_SETTING_DEFAULT } from '../../../../../../plugins/siem/common/constants';
import { KibanaServices } from '../../lib/kibana';
-import { NEWS_FEED_URL_SETTING_DEFAULT } from '../../../common/constants';
import { rawNewsApiResponse } from '../../mock/news';
import { rawNewsJSON } from '../../mock/raw_news';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.tsx
index 11761c8fd39b0..4463f8d4ff602 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.tsx
@@ -5,7 +5,7 @@
*/
import { EuiPanel, EuiToolTip } from '@elastic/eui';
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
import styled from 'styled-components';
import { WithCopyToClipboard } from '../../../lib/clipboard/with_copy_to_clipboard';
@@ -19,33 +19,23 @@ const BodyContainer = styled(EuiPanel)`
BodyContainer.displayName = 'BodyContainer';
-const HoverActionsContainer = styled(EuiPanel)`
- align-items: center;
- display: flex;
- flex-direction: row;
- height: 25px;
- justify-content: center;
- left: 5px;
- position: absolute;
- top: -5px;
- width: 30px;
-`;
-
-HoverActionsContainer.displayName = 'HoverActionsContainer';
-
-export const NoteCardBody = React.memo<{ rawNote: string }>(({ rawNote }) => (
-
-
-
-
-
-
- }
- render={() => }
- />
-
-));
+export const NoteCardBody = React.memo<{ rawNote: string }>(({ rawNote }) => {
+ const hoverContent = useMemo(
+ () => (
+
+
+
+ ),
+ [rawNote]
+ );
+
+ const render = useCallback(() => , [rawNote]);
+
+ return (
+
+
+
+ );
+});
NoteCardBody.displayName = 'NoteCardBody';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/__snapshots__/index.test.tsx.snap
index 42ef4e5404faa..ef02311c0629e 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/__snapshots__/index.test.tsx.snap
@@ -3,22 +3,36 @@
exports[`AddFilterToGlobalSearchBar Component Rendering 1`] = `
-
-
+
+
+
+
}
render={[Function]}
/>
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.test.tsx
index 7e5e53f575be8..5c920d923d9a4 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.test.tsx
@@ -24,6 +24,22 @@ describe('helpers', () => {
});
});
+ test('returns a negated filter when `negate` is true', () => {
+ const filter = createFilter('host.name', 'siem-xavier', true);
+ expect(filter).toEqual({
+ meta: {
+ alias: null,
+ disabled: false,
+ key: 'host.name',
+ negate: true, // <-- filter is negated
+ params: { query: 'siem-xavier' },
+ type: 'phrase',
+ value: 'siem-xavier',
+ },
+ query: { match: { 'host.name': { query: 'siem-xavier', type: 'phrase' } } },
+ });
+ });
+
test('return valid exists filter when valid key and null value are provided', () => {
const filter = createFilter('host.name', null);
expect(filter).toEqual({
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.ts b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.ts
index bafe033368c83..d88bc2bf3b7e6 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.ts
@@ -6,13 +6,17 @@
import { Filter } from '../../../../../../../../src/plugins/data/public';
-export const createFilter = (key: string, value: string[] | string | null | undefined): Filter => {
+export const createFilter = (
+ key: string,
+ value: string[] | string | null | undefined,
+ negate: boolean = false
+): Filter => {
const queryValue = value != null ? (Array.isArray(value) ? value[0] : value) : null;
return queryValue != null
? {
meta: {
alias: null,
- negate: false,
+ negate,
disabled: false,
type: 'phrase',
key,
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.tsx
index 160cd020796db..127eb3bae0284 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.tsx
@@ -4,9 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { EuiIcon, EuiPanel, EuiToolTip } from '@elastic/eui';
+import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
import React, { useCallback } from 'react';
-import styled from 'styled-components';
import { Filter } from '../../../../../../../../src/plugins/data/public';
import { WithHoverActions } from '../../with_hover_actions';
@@ -26,21 +25,52 @@ export const AddFilterToGlobalSearchBar = React.memo(
({ children, filter, onFilterAdded }) => {
const { filterManager } = useKibana().services.data.query;
- const addToKql = useCallback(() => {
+ const filterForValue = useCallback(() => {
filterManager.addFilters(filter);
+
if (onFilterAdded != null) {
onFilterAdded();
}
- }, [filter, filterManager, onFilterAdded]);
+ }, [filterManager, filter, onFilterAdded]);
+
+ const filterOutValue = useCallback(() => {
+ filterManager.addFilters({
+ ...filter,
+ meta: {
+ ...filter.meta,
+ negate: true,
+ },
+ });
+
+ if (onFilterAdded != null) {
+ onFilterAdded();
+ }
+ }, [filterManager, filter, onFilterAdded]);
return (
+
-
+
+
+
+
+
-
+
}
render={() => children}
/>
@@ -49,16 +79,3 @@ export const AddFilterToGlobalSearchBar = React.memo(
);
AddFilterToGlobalSearchBar.displayName = 'AddFilterToGlobalSearchBar';
-
-export const HoverActionsContainer = styled(EuiPanel)`
- align-items: center;
- display: flex;
- flex-direction: row;
- height: 34px;
- justify-content: center;
- left: 5px;
- position: absolute;
- top: -10px;
- width: 34px;
- cursor: pointer;
-`;
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/translations.ts b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/translations.ts
index 81772527e59db..f192c5c26fa49 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/translations.ts
@@ -12,3 +12,10 @@ export const FILTER_FOR_VALUE = i18n.translate(
defaultMessage: 'Filter for value',
}
);
+
+export const FILTER_OUT_VALUE = i18n.translate(
+ 'xpack.siem.add_filter_to_global_search_bar.filterOutValueHoverAction',
+ {
+ defaultMessage: 'Filter out value',
+ }
+);
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.tsx
index 4d0e6a737d303..a0ca5f855237c 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.tsx
@@ -10,8 +10,8 @@ import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
import { getOr } from 'lodash/fp';
import React from 'react';
-import { DEFAULT_DARK_MODE } from '../../../../../common/constants';
-import { DescriptionList } from '../../../../../common/utility_types';
+import { DEFAULT_DARK_MODE } from '../../../../../../../../plugins/siem/common/constants';
+import { DescriptionList } from '../../../../../../../../plugins/siem/common/utility_types';
import { useUiSetting$ } from '../../../../lib/kibana';
import { getEmptyTagValue } from '../../../empty_value';
import { DefaultFieldRenderer, hostIdRenderer } from '../../../field_renderers/field_renderers';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/columns.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/columns.tsx
index 8d490d2c152d9..6bd82f3192f9b 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/columns.tsx
@@ -46,9 +46,7 @@ export const getHostsColumns = (): HostsTableColumns => [
) : (
-
-
-
+
)
}
/>
diff --git a/x-pack/legacy/plugins/siem/public/components/page/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/index.tsx
index ef6a19f4b7448..3a36a2dce476b 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/index.tsx
@@ -17,7 +17,7 @@ export const AppGlobalStyle = createGlobalStyle`
position: static;
}
/* end of dirty hack to fix draggables with tooltip on FF */
-
+
div.app-wrapper {
background-color: rgba(0,0,0,0);
}
@@ -28,12 +28,13 @@ export const AppGlobalStyle = createGlobalStyle`
.euiPopover__panel.euiPopover__panel-isOpen {
z-index: 9900 !important;
+ min-width: 24px;
}
.euiToolTip {
z-index: 9950 !important;
}
- /*
+ /*
overrides the default styling of euiComboBoxOptionsList because it's implemented
as a popover, so it's not selectable as a child of the styled component
*/
@@ -45,6 +46,17 @@ export const AppGlobalStyle = createGlobalStyle`
.euiPanel-loading-hide-border {
border: none;
}
+
+ /* hide open popovers when a modal is being displayed to prevent them from covering the modal */
+ body.euiBody-hasOverlayMask .euiPopover__panel-isOpen {
+ visibility: hidden !important;
+ }
+
+ /* ensure elastic charts tooltips appear above open euiPopovers */
+ .echTooltip {
+ z-index: 9950;
+ }
+
`;
export const DescriptionListStyled = styled(EuiDescriptionList)`
diff --git a/x-pack/legacy/plugins/siem/public/components/page/manage_query.tsx b/x-pack/legacy/plugins/siem/public/components/page/manage_query.tsx
index 138c38c02065b..3b723c66f5af5 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/manage_query.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/manage_query.tsx
@@ -42,6 +42,6 @@ export function manageQuery(WrappedComponent: React.ComponentClass | React
return ;
}
}
- ManageQuery.displayName = `ManageQuery (${WrappedComponent.displayName || 'Unknown'})`;
+ ManageQuery.displayName = `ManageQuery (${WrappedComponent?.displayName ?? 'Unknown'})`;
return ManageQuery;
}
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx
index 56b59ca97156f..a652fef5508fc 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx
@@ -9,8 +9,8 @@ import darkTheme from '@elastic/eui/dist/eui_theme_dark.json';
import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
import React from 'react';
-import { DEFAULT_DARK_MODE } from '../../../../../common/constants';
-import { DescriptionList } from '../../../../../common/utility_types';
+import { DEFAULT_DARK_MODE } from '../../../../../../../../plugins/siem/common/constants';
+import { DescriptionList } from '../../../../../../../../plugins/siem/common/utility_types';
import { useUiSetting$ } from '../../../../lib/kibana';
import { FlowTarget, IpOverviewData, Overview } from '../../../../graphql/types';
import { networkModel } from '../../../../store';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host/index.tsx
index 52c142ceff480..b43efbbde51b3 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host/index.tsx
@@ -10,8 +10,8 @@ import numeral from '@elastic/numeral';
import { FormattedMessage } from '@kbn/i18n/react';
import React, { useMemo } from 'react';
-import { DEFAULT_NUMBER_FORMAT } from '../../../../../common/constants';
-import { ESQuery } from '../../../../../common/typed_json';
+import { DEFAULT_NUMBER_FORMAT } from '../../../../../../../../plugins/siem/common/constants';
+import { ESQuery } from '../../../../../../../../plugins/siem/common/typed_json';
import {
ID as OverviewHostQueryId,
OverviewHostQuery,
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network/index.tsx
index d649a0dd9e923..af50fa88e5fe8 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network/index.tsx
@@ -10,8 +10,8 @@ import numeral from '@elastic/numeral';
import { FormattedMessage } from '@kbn/i18n/react';
import React, { useMemo } from 'react';
-import { DEFAULT_NUMBER_FORMAT } from '../../../../../common/constants';
-import { ESQuery } from '../../../../../common/typed_json';
+import { DEFAULT_NUMBER_FORMAT } from '../../../../../../../../plugins/siem/common/constants';
+import { ESQuery } from '../../../../../../../../plugins/siem/common/typed_json';
import { HeaderSection } from '../../../header_section';
import { useUiSetting$ } from '../../../../lib/kibana';
import { manageQuery } from '../../../page/manage_query';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/stat_value.tsx b/x-pack/legacy/plugins/siem/public/components/page/overview/stat_value.tsx
index 7615001eec9da..cada0a9aff939 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/stat_value.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/stat_value.tsx
@@ -9,7 +9,7 @@ import numeral from '@elastic/numeral';
import React, { useEffect, useState } from 'react';
import styled from 'styled-components';
-import { DEFAULT_NUMBER_FORMAT } from '../../../../common/constants';
+import { DEFAULT_NUMBER_FORMAT } from '../../../../../../../plugins/siem/common/constants';
import { useUiSetting$ } from '../../../lib/kibana';
const ProgressContainer = styled.div`
diff --git a/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx
index 947bdee6a5cd2..2f743c3387209 100644
--- a/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx
@@ -7,13 +7,13 @@
import { mount, shallow } from 'enzyme';
import React from 'react';
+import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../plugins/siem/common/constants';
import { Direction } from '../../graphql/types';
import { BasicTableProps, PaginatedTable } from './index';
import { getHostsColumns, mockData, rowItems, sortedHosts } from './index.mock';
import { ThemeProvider } from 'styled-components';
import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
-import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../common/constants';
jest.mock('react', () => {
const r = jest.requireActual('react');
diff --git a/x-pack/legacy/plugins/siem/public/components/paginated_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/paginated_table/index.tsx
index 5cd200cbb41b7..e481fe7245201 100644
--- a/x-pack/legacy/plugins/siem/public/components/paginated_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/paginated_table/index.tsx
@@ -3,6 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
+
import {
EuiBasicTable,
EuiBasicTableProps,
@@ -21,6 +22,7 @@ import { noop } from 'lodash/fp';
import React, { FC, memo, useState, useEffect, ComponentType } from 'react';
import styled from 'styled-components';
+import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../plugins/siem/common/constants';
import { AuthTableColumns } from '../page/hosts/authentications_table';
import { HostsTableColumns } from '../page/hosts/hosts_table';
import { NetworkDnsColumns } from '../page/network/network_dns_table/columns';
@@ -39,7 +41,6 @@ import { UsersColumns } from '../page/network/users_table/columns';
import { HeaderSection } from '../header_section';
import { Loader } from '../loader';
import { useStateToaster } from '../toasters';
-import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../common/constants';
import * as i18n from './translations';
import { Panel } from '../panel';
@@ -246,21 +247,16 @@ const PaginatedTableComponent: FC = ({
) : (
<>
- {
- // @ts-ignore avoid some type mismatches
- }
= ({
export const PaginatedTable = memo(PaginatedTableComponent);
type BasicTableType = ComponentType>; // eslint-disable-line @typescript-eslint/no-explicit-any
-const BasicTable: typeof EuiBasicTable & { displayName: string } = styled(
- EuiBasicTable as BasicTableType
-)`
+const BasicTable = styled(EuiBasicTable as BasicTableType)`
tbody {
th,
td {
diff --git a/x-pack/legacy/plugins/siem/public/components/query_bar/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/query_bar/index.test.tsx
index 870d0b40d8cd4..49afc8d5ef68b 100644
--- a/x-pack/legacy/plugins/siem/public/components/query_bar/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/query_bar/index.test.tsx
@@ -7,9 +7,9 @@
import { mount } from 'enzyme';
import React from 'react';
+import { DEFAULT_FROM, DEFAULT_TO } from '../../../../../../plugins/siem/common/constants';
import { TestProviders, mockIndexPattern } from '../../mock';
import { createKibanaCoreStartMock } from '../../mock/kibana_core';
-import { DEFAULT_FROM, DEFAULT_TO } from '../../../common/constants';
import { FilterManager, SearchBar } from '../../../../../../../src/plugins/data/public';
import { QueryBar, QueryBarComponentProps } from '.';
import { createKibanaContextProviderMock } from '../../mock/kibana_react';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.tsx
index b8192cce11e5a..62f01dfc020f5 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.tsx
@@ -171,7 +171,7 @@ export const SourceDestinationIp = React.memo(
return isIpFieldPopulated({ destinationIp, sourceIp, type }) ||
hasPorts({ destinationPort, sourcePort, type }) ? (
-
+
(({ header, onColumnRemoved, sort }) => {
- const isLoading = useTimelineContext();
+ const { isLoading } = useTimelineContext();
return (
<>
{sort.columnId === header.id && isLoading ? (
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/header_content.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/header_content.tsx
index 84781e6a24300..0a69cef618570 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/header_content.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/header_content.tsx
@@ -32,7 +32,7 @@ const HeaderContentComponent: React.FC = ({
onClick,
sort,
}) => {
- const isLoading = useTimelineContext();
+ const { isLoading } = useTimelineContext();
return (
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
index 5f59915eac418..417a078a08150 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
@@ -19,6 +19,8 @@ import {
createGenericFileRowRenderer,
} from './generic_row_renderer';
+jest.mock('../../../../../pages/overview/events_by_dataset');
+
describe('GenericRowRenderer', () => {
const mount = useMountAppended();
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx
index 9ccd1fb7a0519..24c52f3372d62 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx
@@ -44,7 +44,7 @@ export const Tokens = React.memo<{ tokens: string[] }>(({ tokens }) => (
<>
{tokens.map(token => (
-
+
{token}
@@ -81,7 +81,7 @@ export const DraggableSignatureId = React.memo<{ id: string; signatureId: number
data-test-subj="signature-id-tooltip"
content={SURICATA_SIGNATURE_ID_FIELD_NAME}
>
-
+
{signatureId}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx
index e1524c8e5aecb..2ad3eb4681454 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx
@@ -119,7 +119,7 @@ export const SystemGenericLine = React.memo(
-
+
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx
index c47d9603cbea2..ef7c3b3ccf859 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx
@@ -193,7 +193,7 @@ export const SystemGenericFileLine = React.memo(
-
+
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
index abe77a63f4a27..2f5fa76855f2b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
@@ -48,6 +48,8 @@ import {
} from './generic_row_renderer';
import * as i18n from './translations';
+jest.mock('../../../../../pages/overview/events_by_dataset');
+
describe('GenericRowRenderer', () => {
const mount = useMountAppended();
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx
index f13a236e8ec36..39c21c4ffa33b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx
@@ -92,7 +92,7 @@ export const DraggableZeekElement = React.memo<{
) : (
-
+
{stringRenderer(value)}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/index.tsx
index 525cc8e301d11..f369b961807af 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/index.tsx
@@ -109,7 +109,7 @@ export const DataProviders = React.memo(
data-test-subj="dataProviders"
>
- {isLoading => (
+ {({ isLoading }) => (
{dataProviders != null && dataProviders.length ? (
(
({ deleteProvider, field, isEnabled, isExcluded, operator, providerId, togglePopover, val }) => {
- const deleteFilter: React.MouseEventHandler = (
- event: React.MouseEvent
- ) => {
- // Make sure it doesn't also trigger the onclick for the whole badge
- if (event.stopPropagation) {
- event.stopPropagation();
- }
- deleteProvider();
- };
- const classes = classNames('globalFilterItem', {
- 'globalFilterItem-isDisabled': !isEnabled,
- 'globalFilterItem-isExcluded': isExcluded,
- });
- const formattedValue = isString(val) && val === '' ? getEmptyString() : val;
- const prefix = isExcluded ? {i18n.NOT} : null;
- const title = `${field}: "${formattedValue}"`;
-
- return (
-
- {prefix}
- {operator !== EXISTS_OPERATOR ? (
- <>
- {`${field}: `}
- {`"${formattedValue}"`}
-
- ) : (
-
- {field} {i18n.EXISTS_LABEL}
-
- )}
-
+ const deleteFilter: React.MouseEventHandler = useCallback(
+ (event: React.MouseEvent) => {
+ // Make sure it doesn't also trigger the onclick for the whole badge
+ if (event.stopPropagation) {
+ event.stopPropagation();
+ }
+ deleteProvider();
+ },
+ [deleteProvider]
+ );
+
+ const classes = useMemo(
+ () =>
+ classNames('globalFilterItem', {
+ 'globalFilterItem-isDisabled': !isEnabled,
+ 'globalFilterItem-isExcluded': isExcluded,
+ }),
+ [isEnabled, isExcluded]
+ );
+
+ const formattedValue = useMemo(() => (isString(val) && val === '' ? getEmptyString() : val), [
+ val,
+ ]);
+
+ const prefix = useMemo(() => (isExcluded ? {i18n.NOT} : null), [isExcluded]);
+
+ const title = useMemo(() => `${field}: "${formattedValue}"`, [field, formattedValue]);
+
+ const hoverContent = useMemo(
+ () => (
+
+ ),
+ [field, val]
);
+
+ const badge = useCallback(
+ () => (
+
+ {prefix}
+ {operator !== EXISTS_OPERATOR ? (
+ <>
+ {`${field}: `}
+ {`"${formattedValue}"`}
+
+ ) : (
+
+ {field} {i18n.EXISTS_LABEL}
+
+ )}
+
+ ),
+ [
+ providerId,
+ field,
+ val,
+ classes,
+ title,
+ deleteFilter,
+ togglePopover,
+ formattedValue,
+ closeButtonProps,
+ prefix,
+ operator,
+ ]
+ );
+
+ return ;
}
);
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_badge.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_badge.tsx
index 79f9c32a176f5..2cc19537d6a63 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_badge.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_badge.tsx
@@ -71,7 +71,7 @@ export const ProviderItemBadge = React.memo(
return (
- {isLoading => (
+ {({ isLoading }) => (
{
- const mockTimelineContext: boolean = true;
+ const isLoading: boolean = true;
const mount = useMountAppended();
+ const filterManager = new FilterManager(mockUiSettingsForFilterManager);
describe('rendering', () => {
test('renders correctly against snapshot', () => {
@@ -96,7 +101,7 @@ describe('Providers', () => {
const mockOnDataProviderRemoved = jest.fn();
const wrapper = mount(
-
+
{
const mockOnDataProviderRemoved = jest.fn();
const wrapper = mount(
-
+
{
const mockOnToggleDataProviderEnabled = jest.fn();
const wrapper = mount(
-
+
{
const wrapper = mount(
-
+
{
const wrapper = mount(
-
+
{
const wrapper = mount(
-
+
{
const wrapper = mount(
-
+
{
@@ -26,6 +30,7 @@ describe('Header', () => {
{
{
= ({
id,
indexPattern,
dataProviders,
+ filterManager,
onChangeDataProviderKqlQuery,
onChangeDroppableAndProvider,
onDataProviderEdited,
@@ -77,6 +79,7 @@ const TimelineHeaderComponent: React.FC = ({
/>
@@ -90,6 +93,7 @@ export const TimelineHeader = React.memo(
prevProps.id === nextProps.id &&
deepEqual(prevProps.indexPattern, nextProps.indexPattern) &&
deepEqual(prevProps.dataProviders, nextProps.dataProviders) &&
+ prevProps.filterManager === nextProps.filterManager &&
prevProps.onChangeDataProviderKqlQuery === nextProps.onChangeDataProviderKqlQuery &&
prevProps.onChangeDroppableAndProvider === nextProps.onChangeDroppableAndProvider &&
prevProps.onDataProviderEdited === nextProps.onDataProviderEdited &&
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.test.tsx
index b978ef3d478d8..a49f6cc930abd 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.test.tsx
@@ -7,16 +7,20 @@
import { mount } from 'enzyme';
import React from 'react';
-import { DEFAULT_FROM, DEFAULT_TO } from '../../../../common/constants';
+import { DEFAULT_FROM, DEFAULT_TO } from '../../../../../../../plugins/siem/common/constants';
import { mockBrowserFields } from '../../../containers/source/mock';
import { convertKueryToElasticSearchQuery } from '../../../lib/keury';
import { mockIndexPattern, TestProviders } from '../../../mock';
+import { createKibanaCoreStartMock } from '../../../mock/kibana_core';
import { QueryBar } from '../../query_bar';
+import { FilterManager } from '../../../../../../../../src/plugins/data/public';
import { mockDataProviders } from '../data_providers/mock/mock_data_providers';
import { buildGlobalQuery } from '../helpers';
import { QueryBarTimeline, QueryBarTimelineComponentProps, getDataProviderFilter } from './index';
+const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;
+
jest.mock('../../../lib/kibana');
describe('Timeline QueryBar ', () => {
@@ -58,6 +62,7 @@ describe('Timeline QueryBar ', () => {
browserFields={mockBrowserFields}
dataProviders={mockDataProviders}
filters={[]}
+ filterManager={new FilterManager(mockUiSettingsForFilterManager)}
filterQuery={{ expression: 'here: query', kind: 'kuery' }}
filterQueryDraft={{ expression: 'here: query', kind: 'kuery' }}
from={0}
@@ -99,6 +104,7 @@ describe('Timeline QueryBar ', () => {
browserFields={mockBrowserFields}
dataProviders={mockDataProviders}
filters={[]}
+ filterManager={new FilterManager(mockUiSettingsForFilterManager)}
filterQuery={{ expression: 'here: query', kind: 'kuery' }}
filterQueryDraft={{ expression: 'here: query', kind: 'kuery' }}
from={0}
@@ -145,6 +151,7 @@ describe('Timeline QueryBar ', () => {
browserFields={mockBrowserFields}
dataProviders={mockDataProviders}
filters={[]}
+ filterManager={new FilterManager(mockUiSettingsForFilterManager)}
filterQuery={{ expression: 'here: query', kind: 'kuery' }}
filterQueryDraft={{ expression: 'here: query', kind: 'kuery' }}
from={0}
@@ -189,6 +196,7 @@ describe('Timeline QueryBar ', () => {
browserFields={mockBrowserFields}
dataProviders={mockDataProviders}
filters={[]}
+ filterManager={new FilterManager(mockUiSettingsForFilterManager)}
filterQuery={{ expression: 'here: query', kind: 'kuery' }}
filterQueryDraft={{ expression: 'here: query', kind: 'kuery' }}
from={0}
@@ -235,6 +243,7 @@ describe('Timeline QueryBar ', () => {
browserFields={mockBrowserFields}
dataProviders={mockDataProviders}
filters={[]}
+ filterManager={new FilterManager(mockUiSettingsForFilterManager)}
filterQuery={{ expression: 'here: query', kind: 'kuery' }}
filterQueryDraft={{ expression: 'here: query', kind: 'kuery' }}
from={0}
@@ -279,6 +288,7 @@ describe('Timeline QueryBar ', () => {
browserFields={mockBrowserFields}
dataProviders={mockDataProviders}
filters={[]}
+ filterManager={new FilterManager(mockUiSettingsForFilterManager)}
filterQuery={{ expression: 'here: query', kind: 'kuery' }}
filterQueryDraft={{ expression: 'here: query', kind: 'kuery' }}
from={0}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.tsx
index 7f662cdb2f1b4..f53f7bb56e2f4 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.tsx
@@ -21,7 +21,6 @@ import {
import { BrowserFields } from '../../../containers/source';
import { convertKueryToElasticSearchQuery } from '../../../lib/keury';
-import { useKibana } from '../../../lib/kibana';
import { KueryFilterQuery, KueryFilterQueryKind } from '../../../store';
import { KqlMode } from '../../../store/timeline/model';
import { useSavedQueryServices } from '../../../utils/saved_query_services';
@@ -35,6 +34,7 @@ export interface QueryBarTimelineComponentProps {
browserFields: BrowserFields;
dataProviders: DataProvider[];
filters: Filter[];
+ filterManager: FilterManager;
filterQuery: KueryFilterQuery;
filterQueryDraft: KueryFilterQuery;
from: number;
@@ -61,6 +61,7 @@ export const QueryBarTimeline = memo(
browserFields,
dataProviders,
filters,
+ filterManager,
filterQuery,
filterQueryDraft,
from,
@@ -94,9 +95,6 @@ export const QueryBarTimeline = memo(
const [dataProvidersDsl, setDataProvidersDsl] = useState(
convertKueryToElasticSearchQuery(buildGlobalQuery(dataProviders, browserFields), indexPattern)
);
- const kibana = useKibana();
- const [filterManager] = useState(new FilterManager(kibana.services.uiSettings));
-
const savedQueryServices = useSavedQueryServices();
useEffect(() => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/index.tsx
index 87061bdbb5d02..a0a0ac4c2b85c 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/index.tsx
@@ -10,7 +10,11 @@ import { connect, ConnectedProps } from 'react-redux';
import { Dispatch } from 'redux';
import deepEqual from 'fast-deep-equal';
-import { Filter, IIndexPattern } from '../../../../../../../../src/plugins/data/public';
+import {
+ Filter,
+ FilterManager,
+ IIndexPattern,
+} from '../../../../../../../../src/plugins/data/public';
import { BrowserFields } from '../../../containers/source';
import { convertKueryToElasticSearchQuery } from '../../../lib/keury';
import {
@@ -29,6 +33,7 @@ import { SearchOrFilter } from './search_or_filter';
interface OwnProps {
browserFields: BrowserFields;
+ filterManager: FilterManager;
indexPattern: IIndexPattern;
timelineId: string;
}
@@ -42,6 +47,7 @@ const StatefulSearchOrFilterComponent = React.memo(
dataProviders,
eventType,
filters,
+ filterManager,
filterQuery,
filterQueryDraft,
from,
@@ -122,6 +128,7 @@ const StatefulSearchOrFilterComponent = React.memo(
dataProviders={dataProviders}
eventType={eventType}
filters={filters}
+ filterManager={filterManager}
filterQuery={filterQuery}
filterQueryDraft={filterQueryDraft}
from={from}
@@ -146,6 +153,7 @@ const StatefulSearchOrFilterComponent = React.memo(
(prevProps, nextProps) => {
return (
prevProps.eventType === nextProps.eventType &&
+ prevProps.filterManager === nextProps.filterManager &&
prevProps.from === nextProps.from &&
prevProps.fromStr === nextProps.fromStr &&
prevProps.to === nextProps.to &&
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx
index 7bdd92e745f21..02a575db259bb 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx
@@ -8,7 +8,11 @@ import { EuiFlexGroup, EuiFlexItem, EuiSuperSelect, EuiToolTip } from '@elastic/
import React from 'react';
import styled, { createGlobalStyle } from 'styled-components';
-import { Filter, IIndexPattern } from '../../../../../../../../src/plugins/data/public';
+import {
+ Filter,
+ FilterManager,
+ IIndexPattern,
+} from '../../../../../../../../src/plugins/data/public';
import { BrowserFields } from '../../../containers/source';
import { KueryFilterQuery, KueryFilterQueryKind } from '../../../store';
import { KqlMode, EventType } from '../../../store/timeline/model';
@@ -44,6 +48,7 @@ interface Props {
browserFields: BrowserFields;
dataProviders: DataProvider[];
eventType: EventType;
+ filterManager: FilterManager;
filterQuery: KueryFilterQuery;
filterQueryDraft: KueryFilterQuery;
from: number;
@@ -95,6 +100,7 @@ export const SearchOrFilter = React.memo(
indexPattern,
isRefreshPaused,
filters,
+ filterManager,
filterQuery,
filterQueryDraft,
from,
@@ -135,6 +141,7 @@ export const SearchOrFilter = React.memo(
browserFields={browserFields}
dataProviders={dataProviders}
filters={filters}
+ filterManager={filterManager}
filterQuery={filterQuery}
filterQueryDraft={filterQueryDraft}
from={from}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.tsx
index 098dd82791610..222cc0530bddb 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.tsx
@@ -6,7 +6,7 @@
import { EuiFlyoutHeader, EuiFlyoutBody, EuiFlyoutFooter } from '@elastic/eui';
import { getOr, isEmpty } from 'lodash/fp';
-import React, { useMemo } from 'react';
+import React, { useState, useMemo } from 'react';
import styled from 'styled-components';
import { FlyoutHeaderWithCloseButton } from '../flyout/header_with_close_button';
@@ -34,7 +34,12 @@ import { TimelineHeader } from './header';
import { combineQueries } from './helpers';
import { TimelineRefetch } from './refetch_timeline';
import { ManageTimelineContext } from './timeline_context';
-import { esQuery, Filter, IIndexPattern } from '../../../../../../../src/plugins/data/public';
+import {
+ esQuery,
+ Filter,
+ FilterManager,
+ IIndexPattern,
+} from '../../../../../../../src/plugins/data/public';
const TimelineContainer = styled.div`
height: 100%;
@@ -143,6 +148,7 @@ export const TimelineComponent: React.FC = ({
usersViewing,
}) => {
const kibana = useKibana();
+ const [filterManager] = useState(new FilterManager(kibana.services.uiSettings));
const combinedQueries = combineQueries({
config: esQuery.getEsQueryConfig(kibana.services.uiSettings),
dataProviders,
@@ -178,6 +184,7 @@ export const TimelineComponent: React.FC = ({
id={id}
indexPattern={indexPattern}
dataProviders={dataProviders}
+ filterManager={filterManager}
onChangeDataProviderKqlQuery={onChangeDataProviderKqlQuery}
onChangeDroppableAndProvider={onChangeDroppableAndProvider}
onDataProviderEdited={onDataProviderEdited}
@@ -211,7 +218,12 @@ export const TimelineComponent: React.FC = ({
getUpdatedAt,
refetch,
}) => (
-
+
(initTimelineContext);
+interface TimelineContextState {
+ filterManager: FilterManager | undefined;
+ isLoading: boolean;
+}
+
+const initTimelineContext: TimelineContextState = { filterManager: undefined, isLoading: false };
+export const TimelineContext = createContext(initTimelineContext);
export const useTimelineContext = () => useContext(TimelineContext);
export interface TimelineTypeContextProps {
documentType?: string;
footerText?: string;
+ id?: string;
+ indexToAdd?: string[] | null;
loadingText?: string;
queryFields?: string[];
selectAll?: boolean;
@@ -24,6 +34,8 @@ export interface TimelineTypeContextProps {
const initTimelineType: TimelineTypeContextProps = {
documentType: undefined,
footerText: undefined,
+ id: undefined,
+ indexToAdd: undefined,
loadingText: undefined,
queryFields: [],
selectAll: false,
@@ -36,6 +48,8 @@ export const useTimelineTypeContext = () => useContext(TimelineTypeContext);
interface ManageTimelineContextProps {
children: React.ReactNode;
+ filterManager: FilterManager;
+ indexToAdd?: string[] | null;
loading: boolean;
type?: TimelineTypeContextProps;
}
@@ -44,22 +58,27 @@ interface ManageTimelineContextProps {
// to avoid so many Context, at least the separation of code is there now
const ManageTimelineContextComponent: React.FC = ({
children,
+ filterManager,
+ indexToAdd,
loading,
- type = initTimelineType,
+ type = { ...initTimelineType, indexToAdd },
}) => {
- const [myLoading, setLoading] = useState(initTimelineContext);
- const [myType, setType] = useState(initTimelineType);
+ const [myContextState, setMyContextState] = useState({
+ filterManager,
+ isLoading: false,
+ });
+ const [myType, setType] = useState(type);
useEffect(() => {
- setLoading(loading);
- }, [loading]);
+ setMyContextState({ filterManager, isLoading: loading });
+ }, [setMyContextState, filterManager, loading]);
useEffect(() => {
- setType(type);
- }, [type]);
+ setType({ ...type, indexToAdd });
+ }, [type, indexToAdd]);
return (
-
+
{children}
);
diff --git a/x-pack/legacy/plugins/siem/public/components/top_n/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/components/top_n/helpers.test.tsx
new file mode 100644
index 0000000000000..da0f6f59b533f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/top_n/helpers.test.tsx
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { allEvents, defaultOptions, getOptions, rawEvents, signalEvents } from './helpers';
+
+describe('getOptions', () => {
+ test(`it returns the default options when 'activeTimelineEventType' is undefined`, () => {
+ expect(getOptions()).toEqual(defaultOptions);
+ });
+
+ test(`it returns 'allEvents' when 'activeTimelineEventType' is 'all'`, () => {
+ expect(getOptions('all')).toEqual(allEvents);
+ });
+
+ test(`it returns 'rawEvents' when 'activeTimelineEventType' is 'raw'`, () => {
+ expect(getOptions('raw')).toEqual(rawEvents);
+ });
+
+ test(`it returns 'signalEvents' when 'activeTimelineEventType' is 'signal'`, () => {
+ expect(getOptions('signal')).toEqual(signalEvents);
+ });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/top_n/helpers.ts b/x-pack/legacy/plugins/siem/public/components/top_n/helpers.ts
new file mode 100644
index 0000000000000..8d9ae48d29b69
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/top_n/helpers.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EventType } from '../../store/timeline/model';
+
+import * as i18n from './translations';
+
+export interface TopNOption {
+ inputDisplay: string;
+ value: EventType;
+ 'data-test-subj': string;
+}
+
+/** A (stable) array containing only the 'All events' option */
+export const allEvents: TopNOption[] = [
+ {
+ value: 'all',
+ inputDisplay: i18n.ALL_EVENTS,
+ 'data-test-subj': 'option-all',
+ },
+];
+
+/** A (stable) array containing only the 'Raw events' option */
+export const rawEvents: TopNOption[] = [
+ {
+ value: 'raw',
+ inputDisplay: i18n.RAW_EVENTS,
+ 'data-test-subj': 'option-raw',
+ },
+];
+
+/** A (stable) array containing only the 'Signal events' option */
+export const signalEvents: TopNOption[] = [
+ {
+ value: 'signal',
+ inputDisplay: i18n.SIGNAL_EVENTS,
+ 'data-test-subj': 'option-signal',
+ },
+];
+
+/** A (stable) array containing the default Top N options */
+export const defaultOptions = [...rawEvents, ...signalEvents];
+
+/**
+ * Returns the options to be displayed in a Top N view select. When
+ * an `activeTimelineEventType` is provided, an array containing
+ * just one option (corresponding to `activeTimelineEventType`)
+ * will be returned, to ensure the data displayed in the Top N
+ * is always in sync with the `EventType` chosen by the user in
+ * the active timeline.
+ */
+export const getOptions = (activeTimelineEventType?: EventType): TopNOption[] => {
+ switch (activeTimelineEventType) {
+ case 'all':
+ return allEvents;
+ case 'raw':
+ return rawEvents;
+ case 'signal':
+ return signalEvents;
+ default:
+ return defaultOptions;
+ }
+};
diff --git a/x-pack/legacy/plugins/siem/public/components/top_n/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/top_n/index.test.tsx
new file mode 100644
index 0000000000000..61772f1dc7a7a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/top_n/index.test.tsx
@@ -0,0 +1,379 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { mount, ReactWrapper } from 'enzyme';
+import React from 'react';
+
+import { mockBrowserFields } from '../../containers/source/mock';
+import { apolloClientObservable, mockGlobalState, TestProviders } from '../../mock';
+import { createKibanaCoreStartMock } from '../../mock/kibana_core';
+import { FilterManager } from '../../../../../../../src/plugins/data/public';
+import { createStore, State } from '../../store';
+import { TimelineContext, TimelineTypeContext } from '../timeline/timeline_context';
+
+import { Props } from './top_n';
+import { ACTIVE_TIMELINE_REDUX_ID, StatefulTopN } from '.';
+
+jest.mock('../../lib/kibana');
+
+const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;
+
+const field = 'process.name';
+const value = 'nice';
+
+const state: State = {
+ ...mockGlobalState,
+ inputs: {
+ ...mockGlobalState.inputs,
+ global: {
+ ...mockGlobalState.inputs.global,
+ query: {
+ query: 'host.name : end*',
+ language: 'kuery',
+ },
+ filters: [
+ {
+ meta: {
+ alias: null,
+ negate: false,
+ disabled: false,
+ type: 'phrase',
+ key: 'host.os.name',
+ params: {
+ query: 'Linux',
+ },
+ },
+ query: {
+ match: {
+ 'host.os.name': {
+ query: 'Linux',
+ type: 'phrase',
+ },
+ },
+ },
+ },
+ ],
+ },
+ timeline: {
+ ...mockGlobalState.inputs.timeline,
+ timerange: {
+ kind: 'relative',
+ fromStr: 'now-24h',
+ toStr: 'now',
+ from: 1586835969047,
+ to: 1586922369047,
+ },
+ },
+ },
+ timeline: {
+ ...mockGlobalState.timeline,
+ timelineById: {
+ [ACTIVE_TIMELINE_REDUX_ID]: {
+ ...mockGlobalState.timeline.timelineById.test,
+ id: ACTIVE_TIMELINE_REDUX_ID,
+ dataProviders: [
+ {
+ id:
+ 'draggable-badge-default-draggable-netflow-renderer-timeline-1-_qpBe3EBD7k-aQQL7v7--_qpBe3EBD7k-aQQL7v7--network_transport-tcp',
+ name: 'tcp',
+ enabled: true,
+ excluded: false,
+ kqlQuery: '',
+ queryMatch: {
+ field: 'network.transport',
+ value: 'tcp',
+ operator: ':',
+ },
+ and: [],
+ },
+ ],
+ eventType: 'all',
+ filters: [
+ {
+ meta: {
+ alias: null,
+ disabled: false,
+ key: 'source.port',
+ negate: false,
+ params: {
+ query: '30045',
+ },
+ type: 'phrase',
+ },
+ query: {
+ match: {
+ 'source.port': {
+ query: '30045',
+ type: 'phrase',
+ },
+ },
+ },
+ },
+ ],
+ kqlMode: 'filter',
+ kqlQuery: {
+ filterQuery: {
+ kuery: {
+ kind: 'kuery',
+ expression: 'host.name : *',
+ },
+ serializedQuery:
+ '{"bool":{"should":[{"exists":{"field":"host.name"}}],"minimum_should_match":1}}',
+ },
+ filterQueryDraft: {
+ kind: 'kuery',
+ expression: 'host.name : *',
+ },
+ },
+ },
+ },
+ },
+};
+const store = createStore(state, apolloClientObservable);
+
+describe('StatefulTopN', () => {
+ // Suppress warnings about "react-beautiful-dnd"
+ /* eslint-disable no-console */
+ const originalError = console.error;
+ const originalWarn = console.warn;
+ beforeAll(() => {
+ console.warn = jest.fn();
+ console.error = jest.fn();
+ });
+ afterAll(() => {
+ console.error = originalError;
+ console.warn = originalWarn;
+ });
+
+ describe('rendering in a global NON-timeline context', () => {
+ let wrapper: ReactWrapper;
+
+ beforeEach(() => {
+ wrapper = mount(
+
+
+
+ );
+ });
+
+ test('it has undefined combinedQueries when rendering in a global context', () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.combinedQueries).toBeUndefined();
+ });
+
+ test(`defaults to the 'Raw events' view when rendering in a global context`, () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.defaultView).toEqual('raw');
+ });
+
+ test(`provides a 'deleteQuery' when rendering in a global context`, () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.deleteQuery).toBeDefined();
+ });
+
+ test(`provides filters from Redux state (inputs > global > filters) when rendering in a global context`, () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.filters).toEqual([
+ {
+ meta: {
+ alias: null,
+ negate: false,
+ disabled: false,
+ type: 'phrase',
+ key: 'host.os.name',
+ params: { query: 'Linux' },
+ },
+ query: { match: { 'host.os.name': { query: 'Linux', type: 'phrase' } } },
+ },
+ ]);
+ });
+
+ test(`provides 'from' via GlobalTime when rendering in a global context`, () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.from).toEqual(0);
+ });
+
+ test('provides the global query from Redux state (inputs > global > query) when rendering in a global context', () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.query).toEqual({ query: 'host.name : end*', language: 'kuery' });
+ });
+
+ test(`provides a 'global' 'setAbsoluteRangeDatePickerTarget' when rendering in a global context`, () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.setAbsoluteRangeDatePickerTarget).toEqual('global');
+ });
+
+ test(`provides 'to' via GlobalTime when rendering in a global context`, () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.to).toEqual(1);
+ });
+ });
+
+ describe('rendering in a timeline context', () => {
+ let filterManager: FilterManager;
+ let wrapper: ReactWrapper;
+
+ beforeEach(() => {
+ filterManager = new FilterManager(mockUiSettingsForFilterManager);
+
+ wrapper = mount(
+
+
+
+
+
+
+
+ );
+ });
+
+ test('it has a combinedQueries value from Redux state composed of the timeline [data providers + kql + filter-bar-filters] when rendering in a timeline context', () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.combinedQueries).toEqual(
+ '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"network.transport":"tcp"}}],"minimum_should_match":1}},{"bool":{"should":[{"exists":{"field":"host.name"}}],"minimum_should_match":1}}]}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1586835969047}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1586922369047}}}],"minimum_should_match":1}}]}}]}},{"match_phrase":{"source.port":{"query":"30045"}}}],"should":[],"must_not":[]}}'
+ );
+ });
+
+ test('it provides only one view option that matches the `eventType` from redux when rendering in the context of the active timeline', () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.defaultView).toEqual('all');
+ });
+
+ test(`provides an undefined 'deleteQuery' when rendering in a timeline context`, () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.deleteQuery).toBeUndefined();
+ });
+
+ test(`provides empty filters when rendering in a timeline context`, () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.filters).toEqual([]);
+ });
+
+ test(`provides 'from' via redux state (inputs > timeline > timerange) when rendering in a timeline context`, () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.from).toEqual(1586835969047);
+ });
+
+ test('provides an empty query when rendering in a timeline context', () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.query).toEqual({ query: '', language: 'kuery' });
+ });
+
+ test(`provides a 'timeline' 'setAbsoluteRangeDatePickerTarget' when rendering in a timeline context`, () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.setAbsoluteRangeDatePickerTarget).toEqual('timeline');
+ });
+
+ test(`provides 'to' via redux state (inputs > timeline > timerange) when rendering in a timeline context`, () => {
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.to).toEqual(1586922369047);
+ });
+ });
+
+ test(`defaults to the 'Signals events' option when rendering in a NON-active timeline context (e.g. the Signals table on the Detections page) when 'documentType' from 'useTimelineTypeContext()' is 'signals'`, () => {
+ const filterManager = new FilterManager(mockUiSettingsForFilterManager);
+ const wrapper = mount(
+
+
+
+
+
+
+
+ );
+
+ const props = wrapper
+ .find('[data-test-subj="top-n"]')
+ .first()
+ .props() as Props;
+
+ expect(props.defaultView).toEqual('signal');
+ });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/top_n/index.tsx b/x-pack/legacy/plugins/siem/public/components/top_n/index.tsx
new file mode 100644
index 0000000000000..983b234a04eaa
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/top_n/index.tsx
@@ -0,0 +1,166 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { connect, ConnectedProps } from 'react-redux';
+
+import { GlobalTime } from '../../containers/global_time';
+import { BrowserFields, WithSource } from '../../containers/source';
+import { useKibana } from '../../lib/kibana';
+import { esQuery, Filter, Query } from '../../../../../../../src/plugins/data/public';
+import { inputsModel, inputsSelectors, State, timelineSelectors } from '../../store';
+import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../store/inputs/actions';
+import { timelineDefaults } from '../../store/timeline/defaults';
+import { TimelineModel } from '../../store/timeline/model';
+import { combineQueries } from '../timeline/helpers';
+import { useTimelineTypeContext } from '../timeline/timeline_context';
+
+import { getOptions } from './helpers';
+import { TopN } from './top_n';
+
+/** The currently active timeline always has this Redux ID */
+export const ACTIVE_TIMELINE_REDUX_ID = 'timeline-1';
+
+const EMPTY_FILTERS: Filter[] = [];
+const EMPTY_QUERY: Query = { query: '', language: 'kuery' };
+
+const makeMapStateToProps = () => {
+ const getGlobalQuerySelector = inputsSelectors.globalQuerySelector();
+ const getGlobalFiltersQuerySelector = inputsSelectors.globalFiltersQuerySelector();
+ const getTimeline = timelineSelectors.getTimelineByIdSelector();
+ const getInputsTimeline = inputsSelectors.getTimelineSelector();
+ const getKqlQueryTimeline = timelineSelectors.getKqlFilterQuerySelector();
+
+ // The mapped Redux state provided to this component includes the global
+ // filters that appear at the top of most views in the app, and all the
+ // filters in the active timeline:
+ const mapStateToProps = (state: State) => {
+ const activeTimeline: TimelineModel =
+ getTimeline(state, ACTIVE_TIMELINE_REDUX_ID) ?? timelineDefaults;
+ const activeTimelineFilters = activeTimeline.filters ?? EMPTY_FILTERS;
+ const activeTimelineInput: inputsModel.InputsRange = getInputsTimeline(state);
+
+ return {
+ activeTimelineEventType: activeTimeline.eventType,
+ activeTimelineFilters,
+ activeTimelineFrom: activeTimelineInput.timerange.from,
+ activeTimelineKqlQueryExpression: getKqlQueryTimeline(state, ACTIVE_TIMELINE_REDUX_ID),
+ activeTimelineTo: activeTimelineInput.timerange.to,
+ dataProviders: activeTimeline.dataProviders,
+ globalQuery: getGlobalQuerySelector(state),
+ globalFilters: getGlobalFiltersQuerySelector(state),
+ kqlMode: activeTimeline.kqlMode,
+ };
+ };
+
+ return mapStateToProps;
+};
+
+const mapDispatchToProps = { setAbsoluteRangeDatePicker: dispatchSetAbsoluteRangeDatePicker };
+
+const connector = connect(makeMapStateToProps, mapDispatchToProps);
+
+interface OwnProps {
+ browserFields: BrowserFields;
+ field: string;
+ toggleTopN: () => void;
+ onFilterAdded?: () => void;
+ value?: string[] | string | null;
+}
+type PropsFromRedux = ConnectedProps;
+type Props = OwnProps & PropsFromRedux;
+
+const StatefulTopNComponent: React.FC = ({
+ activeTimelineEventType,
+ activeTimelineFilters,
+ activeTimelineFrom,
+ activeTimelineKqlQueryExpression,
+ activeTimelineTo,
+ browserFields,
+ dataProviders,
+ field,
+ globalFilters = EMPTY_FILTERS,
+ globalQuery = EMPTY_QUERY,
+ kqlMode,
+ onFilterAdded,
+ setAbsoluteRangeDatePicker,
+ toggleTopN,
+ value,
+}) => {
+ const kibana = useKibana();
+
+ // Regarding data from useTimelineTypeContext:
+ // * `documentType` (e.g. 'signals') may only be populated in some views,
+ // e.g. the `Signals` view on the `Detections` page.
+ // * `id` (`timelineId`) may only be populated when we are rendered in the
+ // context of the active timeline.
+ // * `indexToAdd`, which enables the signals index to be appended to
+ // the `indexPattern` returned by `WithSource`, may only be populated when
+ // this component is rendered in the context of the active timeline. This
+ // behavior enables the 'All events' view by appending the signals index
+ // to the index pattern.
+ const { documentType, id: timelineId, indexToAdd } = useTimelineTypeContext();
+
+ const options = getOptions(
+ timelineId === ACTIVE_TIMELINE_REDUX_ID ? activeTimelineEventType : undefined
+ );
+
+ return (
+
+ {({ from, deleteQuery, setQuery, to }) => (
+
+ {({ indexPattern }) => (
+
+ )}
+
+ )}
+
+ );
+};
+
+StatefulTopNComponent.displayName = 'StatefulTopNComponent';
+
+export const StatefulTopN = connector(React.memo(StatefulTopNComponent));
diff --git a/x-pack/legacy/plugins/siem/public/components/top_n/top_n.test.tsx b/x-pack/legacy/plugins/siem/public/components/top_n/top_n.test.tsx
new file mode 100644
index 0000000000000..13b77ea0ccd4c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/top_n/top_n.test.tsx
@@ -0,0 +1,261 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { mount, ReactWrapper } from 'enzyme';
+import React from 'react';
+
+import { TestProviders, mockIndexPattern } from '../../mock';
+import { setAbsoluteRangeDatePicker } from '../../store/inputs/actions';
+
+import { allEvents, defaultOptions } from './helpers';
+import { TopN } from './top_n';
+
+jest.mock('../../lib/kibana');
+
+jest.mock('uuid', () => {
+ return {
+ v1: jest.fn(() => 'uuid.v1()'),
+ v4: jest.fn(() => 'uuid.v4()'),
+ };
+});
+
+const field = 'process.name';
+const value = 'nice';
+const combinedQueries = {
+ bool: {
+ must: [],
+ filter: [
+ {
+ bool: {
+ filter: [
+ {
+ bool: {
+ filter: [
+ {
+ bool: {
+ should: [{ match_phrase: { 'network.transport': 'tcp' } }],
+ minimum_should_match: 1,
+ },
+ },
+ {
+ bool: { should: [{ exists: { field: 'host.name' } }], minimum_should_match: 1 },
+ },
+ ],
+ },
+ },
+ {
+ bool: {
+ filter: [
+ {
+ bool: {
+ should: [{ range: { '@timestamp': { gte: 1586824450493 } } }],
+ minimum_should_match: 1,
+ },
+ },
+ {
+ bool: {
+ should: [{ range: { '@timestamp': { lte: 1586910850493 } } }],
+ minimum_should_match: 1,
+ },
+ },
+ ],
+ },
+ },
+ ],
+ },
+ },
+ { match_phrase: { 'source.port': { query: '30045' } } },
+ ],
+ should: [],
+ must_not: [],
+ },
+};
+
+describe('TopN', () => {
+ // Suppress warnings about "react-beautiful-dnd"
+ /* eslint-disable no-console */
+ const originalError = console.error;
+ const originalWarn = console.warn;
+ beforeAll(() => {
+ console.warn = jest.fn();
+ console.error = jest.fn();
+ });
+ afterAll(() => {
+ console.error = originalError;
+ console.warn = originalWarn;
+ });
+
+ const query = { query: '', language: 'kuery' };
+
+ describe('common functionality', () => {
+ let toggleTopN: () => void;
+ let wrapper: ReactWrapper;
+
+ beforeEach(() => {
+ toggleTopN = jest.fn();
+ wrapper = mount(
+
+
+
+ );
+ });
+
+ test('it invokes the toggleTopN function when the close button is clicked', () => {
+ wrapper
+ .find('[data-test-subj="close"]')
+ .first()
+ .simulate('click');
+ wrapper.update();
+
+ expect(toggleTopN).toHaveBeenCalled();
+ });
+
+ test('it enables the view select by default', () => {
+ expect(
+ wrapper
+ .find('[data-test-subj="view-select"]')
+ .first()
+ .props().disabled
+ ).toBe(false);
+ });
+ });
+
+ describe('events view', () => {
+ let toggleTopN: () => void;
+ let wrapper: ReactWrapper;
+
+ beforeEach(() => {
+ toggleTopN = jest.fn();
+ wrapper = mount(
+
+
+
+ );
+ });
+
+ test(`it renders EventsByDataset when defaultView is 'raw'`, () => {
+ expect(
+ wrapper.find('[data-test-subj="eventsByDatasetOverview-uuid.v4()Panel"]').exists()
+ ).toBe(true);
+ });
+
+ test(`it does NOT render SignalsByCategory when defaultView is 'raw'`, () => {
+ expect(wrapper.find('[data-test-subj="signals-histogram-panel"]').exists()).toBe(false);
+ });
+ });
+
+ describe('signals view', () => {
+ let toggleTopN: () => void;
+ let wrapper: ReactWrapper;
+
+ beforeEach(() => {
+ toggleTopN = jest.fn();
+ wrapper = mount(
+
+
+
+ );
+ });
+
+ test(`it renders SignalsByCategory when defaultView is 'signal'`, () => {
+ expect(wrapper.find('[data-test-subj="signals-histogram-panel"]').exists()).toBe(true);
+ });
+
+ test(`it does NOT render EventsByDataset when defaultView is 'signal'`, () => {
+ expect(
+ wrapper.find('[data-test-subj="eventsByDatasetOverview-uuid.v4()Panel"]').exists()
+ ).toBe(false);
+ });
+ });
+
+ describe('All events, a view shown only when rendered in the context of the active timeline', () => {
+ let wrapper: ReactWrapper;
+
+ beforeEach(() => {
+ wrapper = mount(
+
+
+
+ );
+ });
+
+ test(`it disables the view select when 'options' contains only one entry`, () => {
+ expect(
+ wrapper
+ .find('[data-test-subj="view-select"]')
+ .first()
+ .props().disabled
+ ).toBe(true);
+ });
+
+ test(`it renders EventsByDataset when defaultView is 'all'`, () => {
+ expect(
+ wrapper.find('[data-test-subj="eventsByDatasetOverview-uuid.v4()Panel"]').exists()
+ ).toBe(true);
+ });
+
+ test(`it does NOT render SignalsByCategory when defaultView is 'all'`, () => {
+ expect(wrapper.find('[data-test-subj="signals-histogram-panel"]').exists()).toBe(false);
+ });
+ });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/top_n/top_n.tsx b/x-pack/legacy/plugins/siem/public/components/top_n/top_n.tsx
new file mode 100644
index 0000000000000..136252617e2a2
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/top_n/top_n.tsx
@@ -0,0 +1,158 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiButtonIcon, EuiSuperSelect } from '@elastic/eui';
+import React, { useCallback, useMemo, useState } from 'react';
+import styled from 'styled-components';
+import { ActionCreator } from 'typescript-fsa';
+
+import { EventsByDataset } from '../../pages/overview/events_by_dataset';
+import { SignalsByCategory } from '../../pages/overview/signals_by_category';
+import { Filter, IIndexPattern, Query } from '../../../../../../../src/plugins/data/public';
+import { inputsModel } from '../../store';
+import { InputsModelId } from '../../store/inputs/constants';
+import { EventType } from '../../store/timeline/model';
+
+import { TopNOption } from './helpers';
+import * as i18n from './translations';
+
+const TopNContainer = styled.div`
+ width: 600px;
+`;
+
+const CloseButton = styled(EuiButtonIcon)`
+ z-index: 999999;
+ position: absolute;
+ right: 4px;
+ top: 4px;
+`;
+
+const ViewSelect = styled(EuiSuperSelect)`
+ z-index: 999999;
+ width: 155px;
+`;
+
+const TopNContent = styled.div`
+ margin-top: 4px;
+
+ .euiPanel {
+ border: none;
+ }
+`;
+
+export interface Props {
+ combinedQueries?: string;
+ defaultView: EventType;
+ deleteQuery?: ({ id }: { id: string }) => void;
+ field: string;
+ filters: Filter[];
+ from: number;
+ indexPattern: IIndexPattern;
+ indexToAdd?: string[] | null;
+ options: TopNOption[];
+ query: Query;
+ setAbsoluteRangeDatePicker: ActionCreator<{
+ id: InputsModelId;
+ from: number;
+ to: number;
+ }>;
+ setAbsoluteRangeDatePickerTarget: InputsModelId;
+ setQuery: (params: {
+ id: string;
+ inspect: inputsModel.InspectQuery | null;
+ loading: boolean;
+ refetch: inputsModel.Refetch;
+ }) => void;
+ to: number;
+ toggleTopN: () => void;
+ onFilterAdded?: () => void;
+ value?: string[] | string | null;
+}
+
+const NO_FILTERS: Filter[] = [];
+const DEFAULT_QUERY: Query = { query: '', language: 'kuery' };
+
+const TopNComponent: React.FC = ({
+ combinedQueries,
+ defaultView,
+ deleteQuery,
+ filters = NO_FILTERS,
+ field,
+ from,
+ indexPattern,
+ indexToAdd,
+ options,
+ query = DEFAULT_QUERY,
+ setAbsoluteRangeDatePicker,
+ setAbsoluteRangeDatePickerTarget,
+ setQuery,
+ to,
+ toggleTopN,
+}) => {
+ const [view, setView] = useState(defaultView);
+ const onViewSelected = useCallback((value: string) => setView(value as EventType), [setView]);
+
+ const headerChildren = useMemo(
+ () => (
+
+ ),
+ [onViewSelected, options, view]
+ );
+
+ return (
+
+
+
+
+ {view === 'raw' || view === 'all' ? (
+
+ ) : (
+
+ )}
+
+
+ );
+};
+
+TopNComponent.displayName = 'TopNComponent';
+
+export const TopN = React.memo(TopNComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/top_n/translations.ts b/x-pack/legacy/plugins/siem/public/components/top_n/translations.ts
new file mode 100644
index 0000000000000..7db55fa94d42e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/top_n/translations.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const CLOSE = i18n.translate('xpack.siem.topN.closeButtonLabel', {
+ defaultMessage: 'Close',
+});
+
+export const ALL_EVENTS = i18n.translate('xpack.siem.topN.allEventsSelectLabel', {
+ defaultMessage: 'All events',
+});
+
+export const RAW_EVENTS = i18n.translate('xpack.siem.topN.rawEventsSelectLabel', {
+ defaultMessage: 'Raw events',
+});
+
+export const SIGNAL_EVENTS = i18n.translate('xpack.siem.topN.signalEventsSelectLabel', {
+ defaultMessage: 'Signal events',
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/with_hover_actions/index.tsx b/x-pack/legacy/plugins/siem/public/components/with_hover_actions/index.tsx
index 07ea165fcbb5c..86a9acc486b6d 100644
--- a/x-pack/legacy/plugins/siem/public/components/with_hover_actions/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/with_hover_actions/index.tsx
@@ -4,8 +4,9 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import React, { useState, useCallback } from 'react';
-import styled from 'styled-components';
+import { EuiPopover } from '@elastic/eui';
+import React, { useCallback, useMemo, useState } from 'react';
+import { IS_DRAGGING_CLASS_NAME } from '../drag_and_drop/helpers';
interface Props {
/**
@@ -26,34 +27,6 @@ interface Props {
*/
render: (showHoverContent: boolean) => JSX.Element;
}
-
-const HoverActionsPanelContainer = styled.div`
- color: ${({ theme }) => theme.eui.textColors.default};
- height: 100%;
- position: relative;
-`;
-
-HoverActionsPanelContainer.displayName = 'HoverActionsPanelContainer';
-
-const HoverActionsPanel = React.memo<{ children: JSX.Element; show: boolean }>(
- ({ children, show }) => (
-
- {show ? children : null}
-
- )
-);
-
-HoverActionsPanel.displayName = 'HoverActionsPanel';
-
-const WithHoverActionsContainer = styled.div`
- display: flex;
- flex-direction: row;
- height: 100%;
- padding-right: 5px;
-`;
-
-WithHoverActionsContainer.displayName = 'WithHoverActionsContainer';
-
/**
* Decorates it's children with actions that are visible on hover.
* This component does not enforce an opinion on the styling and
@@ -68,20 +41,41 @@ export const WithHoverActions = React.memo(
({ alwaysShow = false, hoverContent, render }) => {
const [showHoverContent, setShowHoverContent] = useState(false);
const onMouseEnter = useCallback(() => {
- setShowHoverContent(true);
+ // NOTE: the following read from the DOM is expensive, but not as
+ // expensive as the default behavior, which adds a div to the body,
+ // which-in turn performs a more expensive change to the layout
+ if (!document.body.classList.contains(IS_DRAGGING_CLASS_NAME)) {
+ setShowHoverContent(true);
+ }
}, []);
const onMouseLeave = useCallback(() => {
setShowHoverContent(false);
}, []);
+ const content = useMemo(() => <>{render(showHoverContent)}, [render, showHoverContent]);
+
+ const isOpen = hoverContent != null && (showHoverContent || alwaysShow);
+
+ const popover = useMemo(() => {
+ return (
+
+ {isOpen ? hoverContent : null}
+
+ );
+ }, [content, onMouseLeave, isOpen, alwaysShow, hoverContent]);
+
return (
-
- <>{render(showHoverContent)}
-
- {hoverContent != null ? hoverContent : <>}
-
-
+
+ {popover}
+
);
}
);
diff --git a/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/index.tsx b/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/index.tsx
index 85e19248f2eb5..83c38f2a76175 100644
--- a/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/index.tsx
@@ -5,11 +5,12 @@
*/
import React, { useEffect } from 'react';
+
+import { DEFAULT_ANOMALY_SCORE } from '../../../../../../../plugins/siem/common/constants';
import { AnomaliesQueryTabBodyProps } from './types';
import { getAnomaliesFilterQuery } from './utils';
import { useSiemJobs } from '../../../components/ml_popover/hooks/use_siem_jobs';
import { useUiSetting$ } from '../../../lib/kibana';
-import { DEFAULT_ANOMALY_SCORE } from '../../../../common/constants';
import { MatrixHistogramContainer } from '../../../components/matrix_histogram';
import { histogramConfigs } from './histogram_configs';
const ID = 'anomaliesOverTimeQuery';
diff --git a/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/types.ts b/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/types.ts
index f6cae81e3c6c4..d17eadc68d04b 100644
--- a/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/types.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/types.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { ESTermQuery } from '../../../../common/typed_json';
+import { ESTermQuery } from '../../../../../../../plugins/siem/common/typed_json';
import { NarrowDateRange } from '../../../components/ml/types';
import { UpdateDateRange } from '../../../components/charts/common';
import { SetQuery } from '../../../pages/hosts/navigation/types';
diff --git a/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/utils.ts b/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/utils.ts
index 9609619916ab1..f698e302d3423 100644
--- a/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/utils.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/utils.ts
@@ -5,8 +5,9 @@
*/
import deepmerge from 'deepmerge';
+
+import { ESTermQuery } from '../../../../../../../plugins/siem/common/typed_json';
import { createFilter } from '../../helpers';
-import { ESTermQuery } from '../../../../common/typed_json';
import { SiemJob } from '../../../components/ml_popover/types';
import { FlowTarget } from '../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/containers/authentications/index.tsx b/x-pack/legacy/plugins/siem/public/containers/authentications/index.tsx
index 6d4a88c45a768..13bb40dad04bd 100644
--- a/x-pack/legacy/plugins/siem/public/containers/authentications/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/authentications/index.tsx
@@ -10,7 +10,7 @@ import { Query } from 'react-apollo';
import { connect } from 'react-redux';
import { compose } from 'redux';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import {
AuthenticationsEdges,
GetAuthenticationsQuery,
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
index 5cc73e17662c6..69f4c93a82e2c 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
@@ -4,6 +4,13 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import {
+ DETECTION_ENGINE_RULES_URL,
+ DETECTION_ENGINE_PREPACKAGED_URL,
+ DETECTION_ENGINE_RULES_STATUS_URL,
+ DETECTION_ENGINE_PREPACKAGED_RULES_STATUS_URL,
+ DETECTION_ENGINE_TAGS_URL,
+} from '../../../../../../../plugins/siem/common/constants';
import {
AddRulesProps,
DeleteRulesProps,
@@ -23,13 +30,6 @@ import {
BulkRuleResponse,
} from './types';
import { KibanaServices } from '../../../lib/kibana';
-import {
- DETECTION_ENGINE_RULES_URL,
- DETECTION_ENGINE_PREPACKAGED_URL,
- DETECTION_ENGINE_RULES_STATUS_URL,
- DETECTION_ENGINE_PREPACKAGED_RULES_STATUS_URL,
- DETECTION_ENGINE_TAGS_URL,
-} from '../../../../common/constants';
import * as i18n from '../../../pages/detection_engine/rules/translations';
/**
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.test.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.test.tsx
index cad78ac565903..83b8a3581a4be 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.test.tsx
@@ -6,7 +6,7 @@
import { renderHook, act } from '@testing-library/react-hooks';
-import { defaultIndexPattern } from '../../../../default_index_pattern';
+import { DEFAULT_INDEX_PATTERN } from '../../../../../../../plugins/siem/common/constants';
import { useApolloClient } from '../../../utils/apollo_context';
import { mocksSource } from '../../source/mock';
@@ -25,7 +25,7 @@ describe('useFetchIndexPatterns', () => {
query: () => Promise.resolve(mocksSource[0].result),
}));
const { result, waitForNextUpdate } = renderHook(() =>
- useFetchIndexPatterns(defaultIndexPattern)
+ useFetchIndexPatterns(DEFAULT_INDEX_PATTERN)
);
await waitForNextUpdate();
await waitForNextUpdate();
@@ -429,7 +429,7 @@ describe('useFetchIndexPatterns', () => {
query: () => Promise.reject(new Error('Something went wrong')),
}));
const { result, waitForNextUpdate } = renderHook(() =>
- useFetchIndexPatterns(defaultIndexPattern)
+ useFetchIndexPatterns(DEFAULT_INDEX_PATTERN)
);
await waitForNextUpdate();
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
index f89d21ef1aeb1..2f2de2e151664 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
@@ -6,7 +6,7 @@
import * as t from 'io-ts';
-import { RuleTypeSchema } from '../../../../common/detection_engine/types';
+import { RuleTypeSchema } from '../../../../../../../plugins/siem/common/detection_engine/types';
/**
* Params is an "record", since it is a type of AlertActionParams which is action templates.
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/api.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/api.ts
index 25263c2d32735..ece2483adde3a 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/api.ts
@@ -4,13 +4,13 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { KibanaServices } from '../../../lib/kibana';
import {
DETECTION_ENGINE_QUERY_SIGNALS_URL,
DETECTION_ENGINE_SIGNALS_STATUS_URL,
DETECTION_ENGINE_INDEX_URL,
DETECTION_ENGINE_PRIVILEGES_URL,
-} from '../../../../common/constants';
+} from '../../../../../../../plugins/siem/common/constants';
+import { KibanaServices } from '../../../lib/kibana';
import {
BasicSignals,
Privilege,
diff --git a/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/index.ts b/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/index.ts
index 9cae503d30940..8628ba502f081 100644
--- a/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/index.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/index.ts
@@ -7,7 +7,7 @@
import { get } from 'lodash/fp';
import React, { useEffect, useState } from 'react';
-import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../../plugins/siem/common/constants';
import { GetLastEventTimeQuery, LastEventIndexKey, LastTimeDetails } from '../../../graphql/types';
import { inputsModel } from '../../../store';
import { QueryTemplateProps } from '../../query_template';
diff --git a/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/mock.ts b/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/mock.ts
index ca8786077851f..5ef8e67dedddb 100644
--- a/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/mock.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/mock.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { defaultIndexPattern } from '../../../../default_index_pattern';
+import { DEFAULT_INDEX_PATTERN } from '../../../../../../../plugins/siem/common/constants';
import { GetLastEventTimeQuery, LastEventIndexKey } from '../../../graphql/types';
import { LastEventTimeGqlQuery } from './last_event_time.gql_query';
@@ -43,7 +43,7 @@ export const mockLastEventTimeQuery: MockLastEventTimeQuery[] = [
sourceId: 'default',
indexKey: LastEventIndexKey.hosts,
details: {},
- defaultIndex: defaultIndexPattern,
+ defaultIndex: DEFAULT_INDEX_PATTERN,
},
},
result: {
diff --git a/x-pack/legacy/plugins/siem/public/containers/helpers.test.ts b/x-pack/legacy/plugins/siem/public/containers/helpers.test.ts
index 5d378d79acc7a..67cfe259927ab 100644
--- a/x-pack/legacy/plugins/siem/public/containers/helpers.test.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/helpers.test.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { ESQuery } from '../../common/typed_json';
+import { ESQuery } from '../../../../../plugins/siem/common/typed_json';
import { createFilter } from './helpers';
diff --git a/x-pack/legacy/plugins/siem/public/containers/helpers.ts b/x-pack/legacy/plugins/siem/public/containers/helpers.ts
index 5f66e3f4b88d4..7ff9577bfb05e 100644
--- a/x-pack/legacy/plugins/siem/public/containers/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/helpers.ts
@@ -7,7 +7,7 @@
import { FetchPolicy } from 'apollo-client';
import { isString } from 'lodash/fp';
-import { ESQuery } from '../../common/typed_json';
+import { ESQuery } from '../../../../../plugins/siem/common/typed_json';
export const createFilter = (filterQuery: ESQuery | string | undefined) =>
isString(filterQuery) ? filterQuery : JSON.stringify(filterQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/hosts/first_last_seen/index.ts b/x-pack/legacy/plugins/siem/public/containers/hosts/first_last_seen/index.ts
index e36da5bfbe4ee..5806125f2397b 100644
--- a/x-pack/legacy/plugins/siem/public/containers/hosts/first_last_seen/index.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/hosts/first_last_seen/index.ts
@@ -8,8 +8,8 @@ import ApolloClient from 'apollo-client';
import { get } from 'lodash/fp';
import React, { useEffect, useState } from 'react';
+import { DEFAULT_INDEX_KEY } from '../../../../../../../plugins/siem/common/constants';
import { useUiSetting$ } from '../../../lib/kibana';
-import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
import { GetHostFirstLastSeenQuery } from '../../../graphql/types';
import { inputsModel } from '../../../store';
import { QueryTemplateProps } from '../../query_template';
diff --git a/x-pack/legacy/plugins/siem/public/containers/hosts/first_last_seen/mock.ts b/x-pack/legacy/plugins/siem/public/containers/hosts/first_last_seen/mock.ts
index 2c9d418763e8e..7376f38ae8d0f 100644
--- a/x-pack/legacy/plugins/siem/public/containers/hosts/first_last_seen/mock.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/hosts/first_last_seen/mock.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { defaultIndexPattern } from '../../../../default_index_pattern';
+import { DEFAULT_INDEX_PATTERN } from '../../../../../../../plugins/siem/common/constants';
import { GetHostFirstLastSeenQuery } from '../../../graphql/types';
import { HostFirstLastSeenGqlQuery } from './first_last_seen.gql_query';
@@ -34,7 +34,7 @@ export const mockFirstLastSeenHostQuery: MockedProvidedQuery[] = [
variables: {
sourceId: 'default',
hostName: 'kibana-siem',
- defaultIndex: defaultIndexPattern,
+ defaultIndex: DEFAULT_INDEX_PATTERN,
},
},
result: {
diff --git a/x-pack/legacy/plugins/siem/public/containers/hosts/index.tsx b/x-pack/legacy/plugins/siem/public/containers/hosts/index.tsx
index 733c2224d840a..edf3f6855f955 100644
--- a/x-pack/legacy/plugins/siem/public/containers/hosts/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/hosts/index.tsx
@@ -11,7 +11,7 @@ import { Query } from 'react-apollo';
import { connect } from 'react-redux';
import { compose } from 'redux';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import {
Direction,
GetHostsTableQuery,
diff --git a/x-pack/legacy/plugins/siem/public/containers/hosts/overview/index.tsx b/x-pack/legacy/plugins/siem/public/containers/hosts/overview/index.tsx
index 5057e872b5313..405c45348b54d 100644
--- a/x-pack/legacy/plugins/siem/public/containers/hosts/overview/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/hosts/overview/index.tsx
@@ -10,7 +10,7 @@ import { Query } from 'react-apollo';
import { connect } from 'react-redux';
import { compose } from 'redux';
-import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../../plugins/siem/common/constants';
import { inputsModel, inputsSelectors, State } from '../../../store';
import { getDefaultFetchPolicy } from '../../helpers';
import { QueryTemplate, QueryTemplateProps } from '../../query_template';
diff --git a/x-pack/legacy/plugins/siem/public/containers/ip_overview/index.tsx b/x-pack/legacy/plugins/siem/public/containers/ip_overview/index.tsx
index ade94c430c6ef..954bfede07139 100644
--- a/x-pack/legacy/plugins/siem/public/containers/ip_overview/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/ip_overview/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
import { Query } from 'react-apollo';
import { connect, ConnectedProps } from 'react-redux';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import { GetIpOverviewQuery, IpOverviewData } from '../../graphql/types';
import { networkModel, inputsModel, inputsSelectors, State } from '../../store';
import { useUiSetting } from '../../lib/kibana';
diff --git a/x-pack/legacy/plugins/siem/public/containers/kpi_host_details/index.tsx b/x-pack/legacy/plugins/siem/public/containers/kpi_host_details/index.tsx
index de9d54b1a185c..3933aefa60483 100644
--- a/x-pack/legacy/plugins/siem/public/containers/kpi_host_details/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/kpi_host_details/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
import { Query } from 'react-apollo';
import { connect, ConnectedProps } from 'react-redux';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import { KpiHostDetailsData, GetKpiHostDetailsQuery } from '../../graphql/types';
import { inputsModel, inputsSelectors, State } from '../../store';
import { useUiSetting } from '../../lib/kibana';
diff --git a/x-pack/legacy/plugins/siem/public/containers/kpi_hosts/index.tsx b/x-pack/legacy/plugins/siem/public/containers/kpi_hosts/index.tsx
index 5be2423e8a162..7035d63193118 100644
--- a/x-pack/legacy/plugins/siem/public/containers/kpi_hosts/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/kpi_hosts/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
import { Query } from 'react-apollo';
import { connect, ConnectedProps } from 'react-redux';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import { GetKpiHostsQuery, KpiHostsData } from '../../graphql/types';
import { inputsModel, inputsSelectors, State } from '../../store';
import { useUiSetting } from '../../lib/kibana';
diff --git a/x-pack/legacy/plugins/siem/public/containers/kpi_network/index.tsx b/x-pack/legacy/plugins/siem/public/containers/kpi_network/index.tsx
index 338cdc39b178c..002a819417df6 100644
--- a/x-pack/legacy/plugins/siem/public/containers/kpi_network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/kpi_network/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
import { Query } from 'react-apollo';
import { connect, ConnectedProps } from 'react-redux';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import { GetKpiNetworkQuery, KpiNetworkData } from '../../graphql/types';
import { inputsModel, inputsSelectors, State } from '../../store';
import { useUiSetting } from '../../lib/kibana';
diff --git a/x-pack/legacy/plugins/siem/public/containers/matrix_histogram/index.ts b/x-pack/legacy/plugins/siem/public/containers/matrix_histogram/index.ts
index 0b369b4180fb8..55d7e7cdc6e54 100644
--- a/x-pack/legacy/plugins/siem/public/containers/matrix_histogram/index.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/matrix_histogram/index.ts
@@ -3,9 +3,12 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-import { useEffect, useState, useRef } from 'react';
+
+import { isEmpty } from 'lodash/fp';
+import { useEffect, useMemo, useState, useRef } from 'react';
+
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import { MatrixHistogramQueryProps } from '../../components/matrix_histogram/types';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
import { errorToToaster, useStateToaster } from '../../components/toasters';
import { useUiSetting$ } from '../../lib/kibana';
import { createFilter } from '../helpers';
@@ -19,11 +22,19 @@ export const useQuery = ({
errorMessage,
filterQuery,
histogramType,
+ indexToAdd,
isInspected,
stackByField,
startDate,
}: MatrixHistogramQueryProps) => {
- const [defaultIndex] = useUiSetting$(DEFAULT_INDEX_KEY);
+ const [configIndex] = useUiSetting$(DEFAULT_INDEX_KEY);
+ const defaultIndex = useMemo(() => {
+ if (indexToAdd != null && !isEmpty(indexToAdd)) {
+ return [...configIndex, ...indexToAdd];
+ }
+ return configIndex;
+ }, [configIndex, indexToAdd]);
+
const [, dispatchToaster] = useStateToaster();
const refetch = useRef();
const [loading, setLoading] = useState(false);
@@ -96,6 +107,7 @@ export const useQuery = ({
errorMessage,
filterQuery,
histogramType,
+ indexToAdd,
isInspected,
stackByField,
startDate,
diff --git a/x-pack/legacy/plugins/siem/public/containers/network_dns/index.tsx b/x-pack/legacy/plugins/siem/public/containers/network_dns/index.tsx
index 04c8783c30a0f..060b66fc3cbbe 100644
--- a/x-pack/legacy/plugins/siem/public/containers/network_dns/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/network_dns/index.tsx
@@ -12,7 +12,7 @@ import { compose } from 'redux';
import { DocumentNode } from 'graphql';
import { ScaleType } from '@elastic/charts';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import {
GetNetworkDnsQuery,
NetworkDnsEdges,
diff --git a/x-pack/legacy/plugins/siem/public/containers/network_http/index.tsx b/x-pack/legacy/plugins/siem/public/containers/network_http/index.tsx
index bf4e64f63d559..b13637fa88d07 100644
--- a/x-pack/legacy/plugins/siem/public/containers/network_http/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/network_http/index.tsx
@@ -10,7 +10,7 @@ import { Query } from 'react-apollo';
import { connect } from 'react-redux';
import { compose } from 'redux';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import {
GetNetworkHttpQuery,
NetworkHttpEdges,
diff --git a/x-pack/legacy/plugins/siem/public/containers/network_top_countries/index.tsx b/x-pack/legacy/plugins/siem/public/containers/network_top_countries/index.tsx
index bd1e1a002bbcd..17a14ce3a1120 100644
--- a/x-pack/legacy/plugins/siem/public/containers/network_top_countries/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/network_top_countries/index.tsx
@@ -10,7 +10,7 @@ import { Query } from 'react-apollo';
import { connect } from 'react-redux';
import { compose } from 'redux';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import {
FlowTargetSourceDest,
GetNetworkTopCountriesQuery,
diff --git a/x-pack/legacy/plugins/siem/public/containers/network_top_n_flow/index.tsx b/x-pack/legacy/plugins/siem/public/containers/network_top_n_flow/index.tsx
index f0f1f8257f29f..fdac282292a4b 100644
--- a/x-pack/legacy/plugins/siem/public/containers/network_top_n_flow/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/network_top_n_flow/index.tsx
@@ -10,7 +10,7 @@ import { Query } from 'react-apollo';
import { connect } from 'react-redux';
import { compose } from 'redux';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import {
FlowTargetSourceDest,
GetNetworkTopNFlowQuery,
diff --git a/x-pack/legacy/plugins/siem/public/containers/overview/overview_host/index.tsx b/x-pack/legacy/plugins/siem/public/containers/overview/overview_host/index.tsx
index 2dd9ccf24d802..e7b68bf557a21 100644
--- a/x-pack/legacy/plugins/siem/public/containers/overview/overview_host/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/overview/overview_host/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
import { Query } from 'react-apollo';
import { connect, ConnectedProps } from 'react-redux';
-import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../../plugins/siem/common/constants';
import { GetOverviewHostQuery, OverviewHostData } from '../../../graphql/types';
import { useUiSetting } from '../../../lib/kibana';
import { inputsModel, inputsSelectors } from '../../../store/inputs';
diff --git a/x-pack/legacy/plugins/siem/public/containers/overview/overview_network/index.tsx b/x-pack/legacy/plugins/siem/public/containers/overview/overview_network/index.tsx
index d0acd41c224a5..c7f72ac6193f4 100644
--- a/x-pack/legacy/plugins/siem/public/containers/overview/overview_network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/overview/overview_network/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
import { Query } from 'react-apollo';
import { connect, ConnectedProps } from 'react-redux';
-import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../../plugins/siem/common/constants';
import { GetOverviewNetworkQuery, OverviewNetworkData } from '../../../graphql/types';
import { useUiSetting } from '../../../lib/kibana';
import { State } from '../../../store';
diff --git a/x-pack/legacy/plugins/siem/public/containers/query_template.tsx b/x-pack/legacy/plugins/siem/public/containers/query_template.tsx
index dfb452c24b86e..c33f5fd89a79b 100644
--- a/x-pack/legacy/plugins/siem/public/containers/query_template.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/query_template.tsx
@@ -8,7 +8,7 @@ import { ApolloQueryResult } from 'apollo-client';
import React from 'react';
import { FetchMoreOptions, FetchMoreQueryOptions, OperationVariables } from 'react-apollo';
-import { ESQuery } from '../../common/typed_json';
+import { ESQuery } from '../../../../../plugins/siem/common/typed_json';
export interface QueryTemplateProps {
id?: string;
diff --git a/x-pack/legacy/plugins/siem/public/containers/query_template_paginated.tsx b/x-pack/legacy/plugins/siem/public/containers/query_template_paginated.tsx
index db618f216d83e..45041a6447611 100644
--- a/x-pack/legacy/plugins/siem/public/containers/query_template_paginated.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/query_template_paginated.tsx
@@ -10,7 +10,7 @@ import React from 'react';
import { FetchMoreOptions, FetchMoreQueryOptions, OperationVariables } from 'react-apollo';
import deepEqual from 'fast-deep-equal';
-import { ESQuery } from '../../common/typed_json';
+import { ESQuery } from '../../../../../plugins/siem/common/typed_json';
import { inputsModel } from '../store/model';
import { generateTablePaginationOptions } from '../components/paginated_table/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/containers/source/index.tsx b/x-pack/legacy/plugins/siem/public/containers/source/index.tsx
index e454421ca955d..3467e2b5f18d8 100644
--- a/x-pack/legacy/plugins/siem/public/containers/source/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/source/index.tsx
@@ -11,9 +11,9 @@ import React, { useEffect, useMemo, useState } from 'react';
import memoizeOne from 'memoize-one';
import { IIndexPattern } from 'src/plugins/data/public';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import { useUiSetting$ } from '../../lib/kibana';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
import { IndexField, SourceQuery } from '../../graphql/types';
import { sourceQuery } from './index.gql_query';
diff --git a/x-pack/legacy/plugins/siem/public/containers/source/mock.ts b/x-pack/legacy/plugins/siem/public/containers/source/mock.ts
index 738c1681f40af..805c69f7fcc12 100644
--- a/x-pack/legacy/plugins/siem/public/containers/source/mock.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/source/mock.ts
@@ -4,9 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { DEFAULT_INDEX_PATTERN } from '../../../../../../plugins/siem/common/constants';
+
import { BrowserFields } from '.';
import { sourceQuery } from './index.gql_query';
-import { defaultIndexPattern } from '../../../default_index_pattern';
export const mocksSource = [
{
@@ -14,7 +15,7 @@ export const mocksSource = [
query: sourceQuery,
variables: {
sourceId: 'default',
- defaultIndex: defaultIndexPattern,
+ defaultIndex: DEFAULT_INDEX_PATTERN,
},
},
result: {
@@ -333,7 +334,7 @@ export const mocksSource = [
'event.end contains the date when the event ended or when the activity was last observed.',
example: null,
format: '',
- indexes: defaultIndexPattern,
+ indexes: DEFAULT_INDEX_PATTERN,
name: 'event.end',
searchable: true,
type: 'date',
@@ -661,7 +662,7 @@ export const mockBrowserFields: BrowserFields = {
'event.end contains the date when the event ended or when the activity was last observed.',
example: null,
format: '',
- indexes: defaultIndexPattern,
+ indexes: DEFAULT_INDEX_PATTERN,
name: 'event.end',
searchable: true,
type: 'date',
diff --git a/x-pack/legacy/plugins/siem/public/containers/timeline/all/api.ts b/x-pack/legacy/plugins/siem/public/containers/timeline/all/api.ts
index 4c8e2384de585..32ac62d594e1c 100644
--- a/x-pack/legacy/plugins/siem/public/containers/timeline/all/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/timeline/all/api.ts
@@ -4,9 +4,12 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import {
+ TIMELINE_IMPORT_URL,
+ TIMELINE_EXPORT_URL,
+} from '../../../../../../../plugins/siem/common/constants';
import { ImportDataProps, ImportDataResponse } from '../../detection_engine/rules';
import { KibanaServices } from '../../../lib/kibana';
-import { TIMELINE_IMPORT_URL, TIMELINE_EXPORT_URL } from '../../../../common/constants';
import { ExportSelectedData } from '../../../components/generic_downloader';
export const importTimelines = async ({
diff --git a/x-pack/legacy/plugins/siem/public/containers/timeline/details/index.tsx b/x-pack/legacy/plugins/siem/public/containers/timeline/details/index.tsx
index cf1b8954307e7..0debed9c5f9aa 100644
--- a/x-pack/legacy/plugins/siem/public/containers/timeline/details/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/timeline/details/index.tsx
@@ -9,7 +9,7 @@ import memoizeOne from 'memoize-one';
import React from 'react';
import { Query } from 'react-apollo';
-import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../../plugins/siem/common/constants';
import { DetailItem, GetTimelineDetailsQuery } from '../../../graphql/types';
import { useUiSetting } from '../../../lib/kibana';
diff --git a/x-pack/legacy/plugins/siem/public/containers/timeline/index.tsx b/x-pack/legacy/plugins/siem/public/containers/timeline/index.tsx
index f726ec9779dc8..3c089ef6926dd 100644
--- a/x-pack/legacy/plugins/siem/public/containers/timeline/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/timeline/index.tsx
@@ -11,8 +11,8 @@ import { Query } from 'react-apollo';
import { compose, Dispatch } from 'redux';
import { connect, ConnectedProps } from 'react-redux';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import { IIndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
import {
GetTimelineQuery,
PageInfo,
diff --git a/x-pack/legacy/plugins/siem/public/containers/tls/index.tsx b/x-pack/legacy/plugins/siem/public/containers/tls/index.tsx
index 3738355c8846e..20617b88bda94 100644
--- a/x-pack/legacy/plugins/siem/public/containers/tls/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/tls/index.tsx
@@ -10,7 +10,7 @@ import { Query } from 'react-apollo';
import { connect } from 'react-redux';
import { compose } from 'redux';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import {
PageInfoPaginated,
TlsEdges,
diff --git a/x-pack/legacy/plugins/siem/public/containers/uncommon_processes/index.tsx b/x-pack/legacy/plugins/siem/public/containers/uncommon_processes/index.tsx
index 0a2ce67d9be80..72e4e46bc6ae0 100644
--- a/x-pack/legacy/plugins/siem/public/containers/uncommon_processes/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/uncommon_processes/index.tsx
@@ -10,7 +10,7 @@ import { Query } from 'react-apollo';
import { connect, ConnectedProps } from 'react-redux';
import { compose } from 'redux';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import {
GetUncommonProcessesQuery,
PageInfoPaginated,
diff --git a/x-pack/legacy/plugins/siem/public/containers/users/index.tsx b/x-pack/legacy/plugins/siem/public/containers/users/index.tsx
index 5f71449c52460..658cb5785b54c 100644
--- a/x-pack/legacy/plugins/siem/public/containers/users/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/users/index.tsx
@@ -10,7 +10,7 @@ import { Query } from 'react-apollo';
import { connect, ConnectedProps } from 'react-redux';
import { compose } from 'redux';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../../../plugins/siem/common/constants';
import { GetUsersQuery, FlowTarget, PageInfoPaginated, UsersEdges } from '../../graphql/types';
import { inputsModel, networkModel, networkSelectors, State, inputsSelectors } from '../../store';
import { withKibana, WithKibanaProps } from '../../lib/kibana';
diff --git a/x-pack/legacy/plugins/siem/public/lib/kibana/hooks.ts b/x-pack/legacy/plugins/siem/public/lib/kibana/hooks.ts
index 775a7d7c0acca..e1d0a445bf2fb 100644
--- a/x-pack/legacy/plugins/siem/public/lib/kibana/hooks.ts
+++ b/x-pack/legacy/plugins/siem/public/lib/kibana/hooks.ts
@@ -8,7 +8,10 @@ import moment from 'moment-timezone';
import { useCallback, useEffect, useState } from 'react';
import { i18n } from '@kbn/i18n';
-import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_FORMAT_TZ } from '../../../common/constants';
+import {
+ DEFAULT_DATE_FORMAT,
+ DEFAULT_DATE_FORMAT_TZ,
+} from '../../../../../../plugins/siem/common/constants';
import { useUiSetting, useKibana } from './kibana_react';
import { errorToToaster, useStateToaster } from '../../components/toasters';
import { AuthenticatedUser } from '../../../../../../plugins/security/common/model';
diff --git a/x-pack/legacy/plugins/siem/public/lib/theme/use_eui_theme.tsx b/x-pack/legacy/plugins/siem/public/lib/theme/use_eui_theme.tsx
index 1696001203bc8..b72c34d3b59a7 100644
--- a/x-pack/legacy/plugins/siem/public/lib/theme/use_eui_theme.tsx
+++ b/x-pack/legacy/plugins/siem/public/lib/theme/use_eui_theme.tsx
@@ -7,7 +7,7 @@
import darkTheme from '@elastic/eui/dist/eui_theme_dark.json';
import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
-import { DEFAULT_DARK_MODE } from '../../../common/constants';
+import { DEFAULT_DARK_MODE } from '../../../../../../plugins/siem/common/constants';
import { useUiSetting$ } from '../kibana';
export const useEuiTheme = () => {
diff --git a/x-pack/legacy/plugins/siem/public/mock/global_state.ts b/x-pack/legacy/plugins/siem/public/mock/global_state.ts
index 6678c3043a3da..266c3aadea8af 100644
--- a/x-pack/legacy/plugins/siem/public/mock/global_state.ts
+++ b/x-pack/legacy/plugins/siem/public/mock/global_state.ts
@@ -22,7 +22,7 @@ import {
DEFAULT_TO,
DEFAULT_INTERVAL_TYPE,
DEFAULT_INTERVAL_VALUE,
-} from '../../common/constants';
+} from '../../../../../plugins/siem/common/constants';
export const mockGlobalState: State = {
app: {
diff --git a/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts b/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts
index 968ab6543f4fc..db7a931b3fb15 100644
--- a/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts
+++ b/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts
@@ -23,8 +23,8 @@ import {
DEFAULT_INTERVAL_PAUSE,
DEFAULT_INTERVAL_VALUE,
DEFAULT_BYTES_FORMAT,
-} from '../../common/constants';
-import { defaultIndexPattern } from '../../default_index_pattern';
+ DEFAULT_INDEX_PATTERN,
+} from '../../../../../plugins/siem/common/constants';
import { createKibanaCoreStartMock, createKibanaPluginsStartMock } from './kibana_core';
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -39,7 +39,7 @@ export const mockUiSettings: Record = {
pause: DEFAULT_INTERVAL_PAUSE,
value: DEFAULT_INTERVAL_VALUE,
},
- [DEFAULT_INDEX_KEY]: defaultIndexPattern,
+ [DEFAULT_INDEX_KEY]: DEFAULT_INDEX_PATTERN,
[DEFAULT_BYTES_FORMAT]: '0,0.[0]b',
[DEFAULT_DATE_FORMAT_TZ]: 'UTC',
[DEFAULT_DATE_FORMAT]: 'MMM D, YYYY @ HH:mm:ss.SSS',
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx
index 2000a699ab18d..847fcc7860085 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx
@@ -7,6 +7,8 @@
import { isEmpty } from 'lodash/fp';
import React, { useCallback } from 'react';
import numeral from '@elastic/numeral';
+
+import { DEFAULT_NUMBER_FORMAT } from '../../../../../../../../../plugins/siem/common/constants';
import {
UtilityBar,
UtilityBarAction,
@@ -16,7 +18,6 @@ import {
} from '../../../../../components/utility_bar';
import * as i18n from './translations';
import { useUiSetting$ } from '../../../../../lib/kibana';
-import { DEFAULT_NUMBER_FORMAT } from '../../../../../../common/constants';
import { TimelineNonEcsData } from '../../../../../graphql/types';
import { UpdateSignalsStatus } from '../types';
import { FILTER_CLOSED, FILTER_OPEN } from '../signals_filter_group';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.tsx
index 27ee552146092..90bdd39e4a6fa 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.tsx
@@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { showAllOthersBucket } from '../../../../../../../../plugins/siem/common/constants';
import { HistogramData, SignalsAggregation, SignalsBucket, SignalsGroupBucket } from './types';
import { SignalSearchResponse } from '../../../../containers/detection_engine/signals/types';
import * as i18n from './translations';
@@ -34,48 +35,56 @@ export const getSignalsHistogramQuery = (
additionalFilters: Array<{
bool: { filter: unknown[]; should: unknown[]; must_not: unknown[]; must: unknown[] };
}>
-) => ({
- aggs: {
- signalsByGrouping: {
- terms: {
- field: stackByField,
+) => {
+ const missing = showAllOthersBucket.includes(stackByField)
+ ? {
missing: stackByField.endsWith('.ip') ? '0.0.0.0' : i18n.ALL_OTHERS,
- order: {
- _count: 'desc',
+ }
+ : {};
+
+ return {
+ aggs: {
+ signalsByGrouping: {
+ terms: {
+ field: stackByField,
+ ...missing,
+ order: {
+ _count: 'desc',
+ },
+ size: 10,
},
- size: 10,
- },
- aggs: {
- signals: {
- date_histogram: {
- field: '@timestamp',
- fixed_interval: `${Math.floor((to - from) / 32)}ms`,
- min_doc_count: 0,
- extended_bounds: {
- min: from,
- max: to,
+ aggs: {
+ signals: {
+ date_histogram: {
+ field: '@timestamp',
+ fixed_interval: `${Math.floor((to - from) / 32)}ms`,
+ min_doc_count: 0,
+ extended_bounds: {
+ min: from,
+ max: to,
+ },
},
},
},
},
},
- },
- query: {
- bool: {
- filter: [
- ...additionalFilters,
- {
- range: {
- '@timestamp': {
- gte: from,
- lte: to,
+ query: {
+ bool: {
+ filter: [
+ ...additionalFilters,
+ {
+ range: {
+ '@timestamp': {
+ gte: from,
+ lte: to,
+ },
},
},
- },
- ],
+ ],
+ },
},
- },
-});
+ };
+};
/**
* Returns `true` when the signals histogram initial loading spinner should be shown
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.tsx
index e25442b31da4e..e70ba804ec018 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.tsx
@@ -9,16 +9,20 @@ import numeral from '@elastic/numeral';
import React, { memo, useCallback, useMemo, useState, useEffect } from 'react';
import styled from 'styled-components';
import { isEmpty } from 'lodash/fp';
+import uuid from 'uuid';
+import { DEFAULT_NUMBER_FORMAT } from '../../../../../../../../plugins/siem/common/constants';
+import { LegendItem } from '../../../../components/charts/draggable_legend_item';
+import { escapeDataProviderId } from '../../../../components/drag_and_drop/helpers';
import { HeaderSection } from '../../../../components/header_section';
-
import { Filter, esQuery, Query } from '../../../../../../../../../src/plugins/data/public';
-import { DEFAULT_NUMBER_FORMAT } from '../../../../../common/constants';
import { useQuerySignals } from '../../../../containers/detection_engine/signals/use_query';
import { getDetectionEngineUrl } from '../../../../components/link_to';
+import { defaultLegendColors } from '../../../../components/matrix_histogram/utils';
import { InspectButtonContainer } from '../../../../components/inspect';
import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search';
import { MatrixLoader } from '../../../../components/matrix_histogram/matrix_loader';
+import { MatrixHistogramOption } from '../../../../components/matrix_histogram/types';
import { useKibana, useUiSetting$ } from '../../../../lib/kibana';
import { navTabs } from '../../../home/home_navigations';
import { signalsHistogramOptions } from './config';
@@ -53,6 +57,9 @@ interface SignalsHistogramPanelProps {
deleteQuery?: ({ id }: { id: string }) => void;
filters?: Filter[];
from: number;
+ headerChildren?: React.ReactNode;
+ /** Override all defaults, and only display this field */
+ onlyField?: string;
query?: Query;
legendPosition?: Position;
panelHeight?: number;
@@ -66,12 +73,21 @@ interface SignalsHistogramPanelProps {
updateDateRange: (min: number, max: number) => void;
}
+const getHistogramOption = (fieldName: string): MatrixHistogramOption => ({
+ text: fieldName,
+ value: fieldName,
+});
+
+const NO_LEGEND_DATA: LegendItem[] = [];
+
export const SignalsHistogramPanel = memo(
({
chartHeight,
defaultStackByOption = signalsHistogramOptions[0],
deleteQuery,
filters,
+ headerChildren,
+ onlyField,
query,
from,
legendPosition = 'right',
@@ -85,11 +101,13 @@ export const SignalsHistogramPanel = memo(
title = i18n.HISTOGRAM_HEADER,
updateDateRange,
}) => {
+ // create a unique, but stable (across re-renders) query id
+ const uniqueQueryId = useMemo(() => `${DETECTIONS_HISTOGRAM_ID}-${uuid.v4()}`, []);
const [isInitialLoading, setIsInitialLoading] = useState(true);
const [defaultNumberFormat] = useUiSetting$(DEFAULT_NUMBER_FORMAT);
const [totalSignalsObj, setTotalSignalsObj] = useState(defaultTotalSignalsObj);
const [selectedStackByOption, setSelectedStackByOption] = useState(
- defaultStackByOption
+ onlyField == null ? defaultStackByOption : getHistogramOption(onlyField)
);
const {
loading: isLoadingSignals,
@@ -123,6 +141,21 @@ export const SignalsHistogramPanel = memo(
const formattedSignalsData = useMemo(() => formatSignalsData(signalsData), [signalsData]);
+ const legendItems: LegendItem[] = useMemo(
+ () =>
+ signalsData?.aggregations?.signalsByGrouping?.buckets != null
+ ? signalsData.aggregations.signalsByGrouping.buckets.map((bucket, i) => ({
+ color: i < defaultLegendColors.length ? defaultLegendColors[i] : undefined,
+ dataProviderId: escapeDataProviderId(
+ `draggable-legend-item-${uuid.v4()}-${selectedStackByOption.value}-${bucket.key}`
+ ),
+ field: selectedStackByOption.value,
+ value: bucket.key,
+ }))
+ : NO_LEGEND_DATA,
+ [signalsData, selectedStackByOption.value]
+ );
+
useEffect(() => {
let canceled = false;
@@ -138,7 +171,7 @@ export const SignalsHistogramPanel = memo(
useEffect(() => {
return () => {
if (deleteQuery) {
- deleteQuery({ id: DETECTIONS_HISTOGRAM_ID });
+ deleteQuery({ id: uniqueQueryId });
}
};
}, []);
@@ -146,7 +179,7 @@ export const SignalsHistogramPanel = memo(
useEffect(() => {
if (refetch != null && setQuery != null) {
setQuery({
- id: DETECTIONS_HISTOGRAM_ID,
+ id: uniqueQueryId,
inspect: {
dsl: [request],
response: [response],
@@ -197,46 +230,49 @@ export const SignalsHistogramPanel = memo(
}
}, [showLinkToSignals, urlSearch]);
+ const titleText = useMemo(() => (onlyField == null ? title : i18n.TOP(onlyField)), [
+ onlyField,
+ title,
+ ]);
+
return (
-
+
+
+
+
+ {stackByOptions && (
+
+ )}
+ {headerChildren != null && headerChildren}
+
+ {linkButton}
+
+
+
{isInitialLoading ? (
- <>
-
-
-
+
) : (
- <>
-
-
-
- {stackByOptions && (
-
- )}
-
- {linkButton}
-
-
-
-
-
+
)}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.test.tsx
index 5eb9beaaaf76a..6a116efb8f2f8 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.test.tsx
@@ -14,7 +14,14 @@ jest.mock('../../../../lib/kibana');
describe('SignalsHistogram', () => {
it('renders correctly', () => {
const wrapper = shallow(
-
+
);
expect(wrapper.find('Chart')).toBeTruthy();
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.tsx
index 40e5b8abde072..4bb7e9f6e122f 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.tsx
@@ -12,11 +12,14 @@ import {
Settings,
ChartSizeArray,
} from '@elastic/charts';
+import { EuiFlexGroup, EuiFlexItem, EuiProgress } from '@elastic/eui';
import React, { useMemo } from 'react';
-import { EuiProgress } from '@elastic/eui';
import { useTheme } from '../../../../components/charts/common';
import { histogramDateTimeFormatter } from '../../../../components/utils';
+import { DraggableLegend } from '../../../../components/charts/draggable_legend';
+import { LegendItem } from '../../../../components/charts/draggable_legend_item';
+
import { HistogramData } from './types';
const DEFAULT_CHART_HEIGHT = 174;
@@ -24,18 +27,19 @@ const DEFAULT_CHART_HEIGHT = 174;
interface HistogramSignalsProps {
chartHeight?: number;
from: number;
+ legendItems: LegendItem[];
legendPosition?: Position;
loading: boolean;
to: number;
data: HistogramData[];
updateDateRange: (min: number, max: number) => void;
}
-
export const SignalsHistogram = React.memo(
({
chartHeight = DEFAULT_CHART_HEIGHT,
data,
from,
+ legendItems,
legendPosition = 'right',
loading,
to,
@@ -62,29 +66,38 @@ export const SignalsHistogram = React.memo(
/>
)}
-
-
+
+
+
+
-
+
-
+
-
-
+
+
+
+
+ {legendItems.length > 0 && (
+
+ )}
+
+
);
}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/translations.ts
index 8c88fa4a5dae6..e7b76a48c7592 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/translations.ts
@@ -83,6 +83,12 @@ export const STACK_BY_USERS = i18n.translate(
}
);
+export const TOP = (fieldName: string) =>
+ i18n.translate('xpack.siem.detectionEngine.signals.histogram.topNLabel', {
+ values: { fieldName },
+ defaultMessage: `Top {fieldName}`,
+ });
+
export const HISTOGRAM_HEADER = i18n.translate(
'xpack.siem.detectionEngine.signals.histogram.headerTitle',
{
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
index 80e644f800334..8bea504f84206 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
@@ -19,6 +19,7 @@ import { FormattedRelative } from '@kbn/i18n/react';
import * as H from 'history';
import React, { Dispatch } from 'react';
+import { isMlRule } from '../../../../../../../../plugins/siem/common/detection_engine/ml_helpers';
import { Rule, RuleStatus } from '../../../../containers/detection_engine/rules';
import { getEmptyTagValue } from '../../../../components/empty_value';
import { FormattedDate } from '../../../../components/formatted_date';
@@ -38,7 +39,6 @@ import {
import { Action } from './reducer';
import { LocalizedDateTooltip } from '../../../../components/localized_date_tooltip';
import * as detectionI18n from '../../translations';
-import { isMlRule } from '../../../../../common/detection_engine/ml_helpers';
export const getActions = (
dispatch: React.Dispatch,
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx
index 79da7999b081a..5b7a85e23834d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx
@@ -19,9 +19,9 @@ import { isEmpty } from 'lodash/fp';
import React from 'react';
import styled from 'styled-components';
+import { RuleType } from '../../../../../../../../../plugins/siem/common/detection_engine/types';
import { esFilters } from '../../../../../../../../../../src/plugins/data/public';
-import { RuleType } from '../../../../../../common/detection_engine/types';
import { tacticsOptions, techniquesOptions } from '../../../mitre/mitre_tactics_techniques';
import * as i18n from './translations';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
index 05e47225c8f4b..49977713a585a 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
@@ -9,13 +9,13 @@ import { isEmpty, chunk, get, pick, isNumber } from 'lodash/fp';
import React, { memo, useState } from 'react';
import styled from 'styled-components';
+import { RuleType } from '../../../../../../../../../plugins/siem/common/detection_engine/types';
import {
IIndexPattern,
Filter,
esFilters,
FilterManager,
} from '../../../../../../../../../../src/plugins/data/public';
-import { RuleType } from '../../../../../../common/detection_engine/types';
import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/translations';
import { useKibana } from '../../../../../lib/kibana';
import { IMitreEnterpriseAttack } from '../../types';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx
index 1664ea320bc1e..5e8681a90d428 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx
@@ -8,11 +8,11 @@ import React from 'react';
import styled from 'styled-components';
import { EuiBadge, EuiIcon, EuiLink, EuiToolTip } from '@elastic/eui';
+import { isJobStarted } from '../../../../../../../../../plugins/siem/common/detection_engine/ml_helpers';
import { useKibana } from '../../../../../lib/kibana';
import { SiemJob } from '../../../../../components/ml_popover/types';
import { ListItems } from './types';
import { ML_JOB_STARTED, ML_JOB_STOPPED } from './translations';
-import { isJobStarted } from '../../../../../../common/detection_engine/ml_helpers';
enum MessageLevels {
info = 'info',
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx
index 794edf0ab5de7..82350150488d0 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx
@@ -17,6 +17,7 @@ import {
} from '@elastic/eui';
import styled from 'styled-components';
+import { isJobStarted } from '../../../../../../../../../plugins/siem/common/detection_engine/ml_helpers';
import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../../shared_imports';
import { useSiemJobs } from '../../../../../components/ml_popover/hooks/use_siem_jobs';
import { useKibana } from '../../../../../lib/kibana';
@@ -24,7 +25,6 @@ import {
ML_JOB_SELECT_PLACEHOLDER_TEXT,
ENABLE_ML_JOB_WARNING,
} from '../step_define_rule/translations';
-import { isJobStarted } from '../../../../../../common/detection_engine/ml_helpers';
const HelpTextWarningContainer = styled.div`
margin-top: 10px;
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx
index a746d381c494c..b4d813c48b43f 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx
@@ -7,6 +7,7 @@
import React, { useCallback, useEffect, useState } from 'react';
import deepMerge from 'deepmerge';
+import { NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS } from '../../../../../../../../../plugins/siem/common/constants';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { loadActionTypes } from '../../../../../../../../../plugins/triggers_actions_ui/public/application/lib/action_connector_api';
import { SelectField } from '../../../../../shared_imports';
@@ -16,7 +17,6 @@ import {
} from '../../../../../../../../../plugins/triggers_actions_ui/public';
import { AlertAction } from '../../../../../../../../../plugins/alerting/common';
import { useKibana } from '../../../../../lib/kibana';
-import { NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS } from '../../../../../../common/constants';
type ThrottleSelectField = typeof SelectField;
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
index 6f3d299da8d45..2b1e5a367a965 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
@@ -16,8 +16,8 @@ import {
EuiText,
} from '@elastic/eui';
-import { isMlRule } from '../../../../../../common/detection_engine/ml_helpers';
-import { RuleType } from '../../../../../../common/detection_engine/types';
+import { isMlRule } from '../../../../../../../../../plugins/siem/common/detection_engine/ml_helpers';
+import { RuleType } from '../../../../../../../../../plugins/siem/common/detection_engine/types';
import { FieldHook } from '../../../../../shared_imports';
import { useKibana } from '../../../../../lib/kibana';
import * as i18n from './translations';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
index 05043e5b96a30..be9e919b806b5 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
@@ -9,10 +9,10 @@ import React, { FC, memo, useCallback, useState, useEffect } from 'react';
import styled from 'styled-components';
import deepEqual from 'fast-deep-equal';
+import { DEFAULT_INDEX_KEY } from '../../../../../../../../../plugins/siem/common/constants';
+import { isMlRule } from '../../../../../../../../../plugins/siem/common/detection_engine/ml_helpers';
import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/public';
import { useFetchIndexPatterns } from '../../../../../containers/detection_engine/rules';
-import { DEFAULT_INDEX_KEY } from '../../../../../../common/constants';
-import { isMlRule } from '../../../../../../common/detection_engine/ml_helpers';
import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/translations';
import { useMlCapabilities } from '../../../../../components/ml_popover/hooks/use_ml_capabilities';
import { useUiSetting$ } from '../../../../../lib/kibana';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx
index 4a132f94a9871..629c6758a1414 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx
@@ -9,8 +9,8 @@ import { EuiText } from '@elastic/eui';
import { isEmpty } from 'lodash/fp';
import React from 'react';
+import { isMlRule } from '../../../../../../../../../plugins/siem/common/detection_engine/ml_helpers';
import { esKuery } from '../../../../../../../../../../src/plugins/data/public';
-import { isMlRule } from '../../../../../../common/detection_engine/ml_helpers';
import { FieldValueQueryBar } from '../query_bar';
import {
ERROR_CODE,
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx
index 0cf15c41a0f91..3b297a623e34d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx
@@ -9,7 +9,7 @@ import React, { useCallback } from 'react';
import {
NOTIFICATION_THROTTLE_RULE,
NOTIFICATION_THROTTLE_NO_ACTIONS,
-} from '../../../../../../common/constants';
+} from '../../../../../../../../../plugins/siem/common/constants';
import { SelectField } from '../../../../../shared_imports';
export const THROTTLE_OPTIONS = [
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
index 7ad116c313361..a65e8178f75c4 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
@@ -8,10 +8,10 @@ import { has, isEmpty } from 'lodash/fp';
import moment from 'moment';
import deepmerge from 'deepmerge';
-import { NOTIFICATION_THROTTLE_NO_ACTIONS } from '../../../../../common/constants';
-import { transformAlertToRuleAction } from '../../../../../common/detection_engine/transform_actions';
-import { RuleType } from '../../../../../common/detection_engine/types';
-import { isMlRule } from '../../../../../common/detection_engine/ml_helpers';
+import { NOTIFICATION_THROTTLE_NO_ACTIONS } from '../../../../../../../../plugins/siem/common/constants';
+import { transformAlertToRuleAction } from '../../../../../../../../plugins/siem/common/detection_engine/transform_actions';
+import { RuleType } from '../../../../../../../../plugins/siem/common/detection_engine/types';
+import { isMlRule } from '../../../../../../../../plugins/siem/common/detection_engine/ml_helpers';
import { NewRule } from '../../../../containers/detection_engine/rules';
import {
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
index 58a1b0fd3133e..7bea41c2ab4d5 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
@@ -10,9 +10,12 @@ import moment from 'moment';
import memoizeOne from 'memoize-one';
import { useLocation } from 'react-router-dom';
-import { RuleAlertAction, RuleType } from '../../../../common/detection_engine/types';
-import { isMlRule } from '../../../../common/detection_engine/ml_helpers';
-import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
+import {
+ RuleAlertAction,
+ RuleType,
+} from '../../../../../../../plugins/siem/common/detection_engine/types';
+import { isMlRule } from '../../../../../../../plugins/siem/common/detection_engine/ml_helpers';
+import { transformRuleToAlertAction } from '../../../../../../../plugins/siem/common/detection_engine/transform_actions';
import { Filter } from '../../../../../../../../src/plugins/data/public';
import { Rule } from '../../../containers/detection_engine/rules';
import { FormData, FormHook, FormSchema } from '../../../shared_imports';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
index 1c366e6640b29..380ef52190349 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
@@ -4,8 +4,11 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import {
+ RuleAlertAction,
+ RuleType,
+} from '../../../../../../../plugins/siem/common/detection_engine/types';
import { AlertAction } from '../../../../../../../plugins/alerting/common';
-import { RuleAlertAction, RuleType } from '../../../../common/detection_engine/types';
import { Filter } from '../../../../../../../../src/plugins/data/common';
import { FieldValueQueryBar } from './components/query_bar';
import { FormData, FormHook } from '../../../shared_imports';
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/types.ts b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/types.ts
index cb5fc62b96582..207b86fee02b9 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/types.ts
@@ -4,9 +4,9 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { ESTermQuery } from '../../../../../../../plugins/siem/common/typed_json';
import { Filter, IIndexPattern } from '../../../../../../../../src/plugins/data/public';
import { NarrowDateRange } from '../../../components/ml/types';
-import { ESTermQuery } from '../../../../common/typed_json';
import { InspectQuery, Refetch } from '../../../store/inputs/model';
import { HostsTableType, HostsType } from '../../../store/hosts/model';
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/types.ts b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/types.ts
index ef989fb64eabe..efd9c644ec6b6 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/types.ts
@@ -6,8 +6,8 @@
import { IIndexPattern } from 'src/plugins/data/public';
+import { ESTermQuery } from '../../../../../../../plugins/siem/common/typed_json';
import { NetworkType } from '../../../store/network/model';
-import { ESTermQuery } from '../../../../common/typed_json';
import { InspectQuery, Refetch } from '../../../store/inputs/model';
import { FlowTarget, FlowTargetSourceDest } from '../../../graphql/types';
import { GlobalTimeArgs } from '../../../containers/global_time';
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/navigation/types.ts b/x-pack/legacy/plugins/siem/public/pages/network/navigation/types.ts
index 222a99992917d..90c18b6ff69f4 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/navigation/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/network/navigation/types.ts
@@ -4,12 +4,12 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { ESTermQuery } from '../../../../../../../plugins/siem/common/typed_json';
import { IIndexPattern } from '../../../../../../../../src/plugins/data/common/';
import { NavTab } from '../../../components/navigation/types';
import { FlowTargetSourceDest } from '../../../graphql/types';
import { networkModel } from '../../../store';
-import { ESTermQuery } from '../../../../common/typed_json';
import { GlobalTimeArgs } from '../../../containers/global_time';
import { SetAbsoluteRangeDatePicker } from '../types';
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/alerts_by_category/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/alerts_by_category/index.test.tsx
index d838b936a2d65..bd9743bdccb4b 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/alerts_by_category/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/alerts_by_category/index.test.tsx
@@ -66,8 +66,8 @@ describe('Alerts by category', () => {
);
});
- test('it does NOT render the subtitle', () => {
- expect(wrapper.find('[data-test-subj="header-panel-subtitle"]').exists()).toBe(false);
+ test('it renders the subtitle (to prevent layout thrashing)', () => {
+ expect(wrapper.find('[data-test-subj="header-panel-subtitle"]').exists()).toBe(true);
});
test('it renders the expected filter fields', () => {
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/alerts_by_category/index.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/alerts_by_category/index.tsx
index 744102fbac4b3..8e09572cb2796 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/alerts_by_category/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/alerts_by_category/index.tsx
@@ -7,9 +7,9 @@
import { EuiButton } from '@elastic/eui';
import numeral from '@elastic/numeral';
import React, { useEffect, useMemo } from 'react';
-
import { Position } from '@elastic/charts';
-import { DEFAULT_NUMBER_FORMAT } from '../../../../common/constants';
+
+import { DEFAULT_NUMBER_FORMAT } from '../../../../../../../plugins/siem/common/constants';
import { SHOWING, UNIT } from '../../../components/alerts_viewer/translations';
import { getDetectionEngineAlertUrl } from '../../../components/link_to/redirect_to_detection_engine';
import { MatrixHistogramContainer } from '../../../components/matrix_histogram';
diff --git a/x-pack/plugins/uptime/server/graphql/constants.ts b/x-pack/legacy/plugins/siem/public/pages/overview/events_by_dataset/__mocks__/index.tsx
similarity index 79%
rename from x-pack/plugins/uptime/server/graphql/constants.ts
rename to x-pack/legacy/plugins/siem/public/pages/overview/events_by_dataset/__mocks__/index.tsx
index aba58f5c6c4a5..dad1e0034b4e2 100644
--- a/x-pack/plugins/uptime/server/graphql/constants.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/events_by_dataset/__mocks__/index.tsx
@@ -4,4 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
-export const DEFAULT_GRAPHQL_PATH = '/api/uptime/graphql';
+export const EventsByDataset = () => 'mock EventsByDataset';
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/events_by_dataset/index.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/events_by_dataset/index.tsx
index cc1f9b1cc5681..14cc29adb505a 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/events_by_dataset/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/events_by_dataset/index.tsx
@@ -4,18 +4,26 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { Position } from '@elastic/charts';
import { EuiButton } from '@elastic/eui';
import numeral from '@elastic/numeral';
import React, { useEffect, useMemo } from 'react';
+import uuid from 'uuid';
-import { Position } from '@elastic/charts';
+import { DEFAULT_NUMBER_FORMAT } from '../../../../../../../plugins/siem/common/constants';
import { SHOWING, UNIT } from '../../../components/events_viewer/translations';
-import { convertToBuildEsQuery } from '../../../lib/keury';
import { getTabsOnHostsUrl } from '../../../components/link_to/redirect_to_hosts';
-import { histogramConfigs } from '../../../pages/hosts/navigation/events_query_tab_body';
import { MatrixHistogramContainer } from '../../../components/matrix_histogram';
+import {
+ MatrixHisrogramConfigs,
+ MatrixHistogramOption,
+} from '../../../components/matrix_histogram/types';
+import { useGetUrlSearch } from '../../../components/navigation/use_get_url_search';
+import { navTabs } from '../../home/home_navigations';
import { eventsStackByOptions } from '../../hosts/navigation';
+import { convertToBuildEsQuery } from '../../../lib/keury';
import { useKibana, useUiSetting$ } from '../../../lib/kibana';
+import { histogramConfigs } from '../../../pages/hosts/navigation/events_query_tab_body';
import {
Filter,
esQuery,
@@ -24,12 +32,9 @@ import {
} from '../../../../../../../../src/plugins/data/public';
import { inputsModel } from '../../../store';
import { HostsTableType, HostsType } from '../../../store/hosts/model';
-import { DEFAULT_NUMBER_FORMAT } from '../../../../common/constants';
+import { InputsModelId } from '../../../store/inputs/constants';
import * as i18n from '../translations';
-import { MatrixHisrogramConfigs } from '../../../components/matrix_histogram/types';
-import { useGetUrlSearch } from '../../../components/navigation/use_get_url_search';
-import { navTabs } from '../../home/home_navigations';
const NO_FILTERS: Filter[] = [];
const DEFAULT_QUERY: Query = { query: '', language: 'kuery' };
@@ -38,36 +43,56 @@ const DEFAULT_STACK_BY = 'event.dataset';
const ID = 'eventsByDatasetOverview';
interface Props {
+ combinedQueries?: string;
deleteQuery?: ({ id }: { id: string }) => void;
filters?: Filter[];
from: number;
+ headerChildren?: React.ReactNode;
indexPattern: IIndexPattern;
+ indexToAdd?: string[] | null;
+ onlyField?: string;
query?: Query;
+ setAbsoluteRangeDatePickerTarget?: InputsModelId;
setQuery: (params: {
id: string;
inspect: inputsModel.InspectQuery | null;
loading: boolean;
refetch: inputsModel.Refetch;
}) => void;
+ showSpacer?: boolean;
to: number;
}
+const getHistogramOption = (fieldName: string): MatrixHistogramOption => ({
+ text: fieldName,
+ value: fieldName,
+});
+
const EventsByDatasetComponent: React.FC = ({
+ combinedQueries,
deleteQuery,
filters = NO_FILTERS,
from,
+ headerChildren,
indexPattern,
+ indexToAdd,
+ onlyField,
query = DEFAULT_QUERY,
+ setAbsoluteRangeDatePickerTarget,
setQuery,
+ showSpacer = true,
to,
}) => {
+ // create a unique, but stable (across re-renders) query id
+ const uniqueQueryId = useMemo(() => `${ID}-${uuid.v4()}`, []);
+
useEffect(() => {
return () => {
if (deleteQuery) {
- deleteQuery({ id: ID });
+ deleteQuery({ id: uniqueQueryId });
}
};
- }, [deleteQuery]);
+ }, [deleteQuery, uniqueQueryId]);
const kibana = useKibana();
const [defaultNumberFormat] = useUiSetting$(DEFAULT_NUMBER_FORMAT);
@@ -84,38 +109,62 @@ const EventsByDatasetComponent: React.FC = ({
const filterQuery = useMemo(
() =>
- convertToBuildEsQuery({
- config: esQuery.getEsQueryConfig(kibana.services.uiSettings),
- indexPattern,
- queries: [query],
- filters,
- }),
- [kibana, indexPattern, query, filters]
+ combinedQueries == null
+ ? convertToBuildEsQuery({
+ config: esQuery.getEsQueryConfig(kibana.services.uiSettings),
+ indexPattern,
+ queries: [query],
+ filters,
+ })
+ : combinedQueries,
+ [combinedQueries, kibana, indexPattern, query, filters]
);
const eventsByDatasetHistogramConfigs: MatrixHisrogramConfigs = useMemo(
() => ({
...histogramConfigs,
+ stackByOptions:
+ onlyField != null ? [getHistogramOption(onlyField)] : histogramConfigs.stackByOptions,
defaultStackByOption:
- eventsStackByOptions.find(o => o.text === DEFAULT_STACK_BY) ?? eventsStackByOptions[0],
+ onlyField != null
+ ? getHistogramOption(onlyField)
+ : eventsStackByOptions.find(o => o.text === DEFAULT_STACK_BY) ?? eventsStackByOptions[0],
legendPosition: Position.Right,
subtitle: (totalCount: number) =>
`${SHOWING}: ${numeral(totalCount).format(defaultNumberFormat)} ${UNIT(totalCount)}`,
+ titleSize: onlyField == null ? 'm' : 's',
}),
- []
+ [onlyField, defaultNumberFormat]
);
+ const headerContent = useMemo(() => {
+ if (onlyField == null || headerChildren != null) {
+ return (
+ <>
+ {headerChildren}
+ {onlyField == null && eventsCountViewEventsButton}
+
+ );
+ } else {
+ return null;
+ }
+ }, [onlyField, headerChildren, eventsCountViewEventsButton]);
+
return (
);
};
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/overview.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/overview.tsx
index 2db49e60193fc..82f4444728902 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/overview.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/overview.tsx
@@ -63,7 +63,7 @@ const OverviewComponent: React.FC = ({
from={from}
indexPattern={indexPattern}
query={query}
- setAbsoluteRangeDatePicker={setAbsoluteRangeDatePicker!}
+ setAbsoluteRangeDatePicker={setAbsoluteRangeDatePicker}
setQuery={setQuery}
to={to}
/>
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/sidebar/sidebar.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/sidebar/sidebar.tsx
index 52e36b472a0ec..4d4d96803cd65 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/sidebar/sidebar.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/sidebar/sidebar.tsx
@@ -8,9 +8,12 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
import React, { useMemo } from 'react';
import styled from 'styled-components';
+import {
+ ENABLE_NEWS_FEED_SETTING,
+ NEWS_FEED_URL_SETTING,
+} from '../../../../../../../plugins/siem/common/constants';
import { Filters as RecentCasesFilters } from '../../../components/recent_cases/filters';
import { Filters as RecentTimelinesFilters } from '../../../components/recent_timelines/filters';
-import { ENABLE_NEWS_FEED_SETTING, NEWS_FEED_URL_SETTING } from '../../../../common/constants';
import { StatefulRecentCases } from '../../../components/recent_cases';
import { StatefulRecentTimelines } from '../../../components/recent_timelines';
import { StatefulNewsFeed } from '../../../components/news_feed';
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/signals_by_category/index.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/signals_by_category/index.tsx
index 5f78c4c10eb37..feba80539a11b 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/signals_by_category/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/signals_by_category/index.tsx
@@ -12,6 +12,7 @@ import { useSignalIndex } from '../../../containers/detection_engine/signals/use
import { SetAbsoluteRangeDatePicker } from '../../network/types';
import { Filter, IIndexPattern, Query } from '../../../../../../../../src/plugins/data/public';
import { inputsModel } from '../../../store';
+import { InputsModelId } from '../../../store/inputs/constants';
import * as i18n from '../translations';
const DEFAULT_QUERY: Query = { query: '', language: 'kuery' };
@@ -22,9 +23,13 @@ interface Props {
deleteQuery?: ({ id }: { id: string }) => void;
filters?: Filter[];
from: number;
+ headerChildren?: React.ReactNode;
indexPattern: IIndexPattern;
+ /** Override all defaults, and only display this field */
+ onlyField?: string;
query?: Query;
setAbsoluteRangeDatePicker: SetAbsoluteRangeDatePicker;
+ setAbsoluteRangeDatePickerTarget?: InputsModelId;
setQuery: (params: {
id: string;
inspect: inputsModel.InspectQuery | null;
@@ -38,15 +43,18 @@ const SignalsByCategoryComponent: React.FC = ({
deleteQuery,
filters = NO_FILTERS,
from,
+ headerChildren,
+ onlyField,
query = DEFAULT_QUERY,
setAbsoluteRangeDatePicker,
+ setAbsoluteRangeDatePickerTarget = 'global',
setQuery,
to,
}) => {
const { signalIndexName } = useSignalIndex();
const updateDateRangeCallback = useCallback(
(min: number, max: number) => {
- setAbsoluteRangeDatePicker!({ id: 'global', from: min, to: max });
+ setAbsoluteRangeDatePicker({ id: setAbsoluteRangeDatePickerTarget, from: min, to: max });
},
[setAbsoluteRangeDatePicker]
);
@@ -60,12 +68,14 @@ const SignalsByCategoryComponent: React.FC = ({
defaultStackByOption={defaultStackByOption}
filters={filters}
from={from}
+ headerChildren={headerChildren}
+ onlyField={onlyField}
query={query}
signalIndexName={signalIndexName}
setQuery={setQuery}
showTotalSignalsCount={true}
- showLinkToSignals={true}
- stackByOptions={signalsHistogramOptions}
+ showLinkToSignals={onlyField == null ? true : false}
+ stackByOptions={onlyField == null ? signalsHistogramOptions : undefined}
legendPosition={'right'}
to={to}
title={i18n.SIGNAL_COUNT}
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/translations.ts b/x-pack/legacy/plugins/siem/public/pages/overview/translations.ts
index 601a629d86e57..b7bee15e4c5bf 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/translations.ts
@@ -38,6 +38,12 @@ export const SIGNAL_COUNT = i18n.translate('xpack.siem.overview.signalCountTitle
defaultMessage: 'Signal count',
});
+export const TOP = (fieldName: string) =>
+ i18n.translate('xpack.siem.overview.topNLabel', {
+ values: { fieldName },
+ defaultMessage: `Top {fieldName}`,
+ });
+
export const VIEW_ALERTS = i18n.translate('xpack.siem.overview.viewAlertsButtonLabel', {
defaultMessage: 'View alerts',
});
diff --git a/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.test.tsx b/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.test.tsx
index 62399891c9606..ae95a1316a600 100644
--- a/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.test.tsx
@@ -10,6 +10,8 @@ import { shallow, ShallowWrapper } from 'enzyme';
import React from 'react';
import ApolloClient from 'apollo-client';
+jest.mock('../../pages/overview/events_by_dataset');
+
jest.mock('../../lib/kibana', () => {
return {
useKibana: jest.fn(),
diff --git a/x-pack/legacy/plugins/siem/public/register_feature.ts b/x-pack/legacy/plugins/siem/public/register_feature.ts
index ca7a22408b6ff..b5e8f78ebc560 100644
--- a/x-pack/legacy/plugins/siem/public/register_feature.ts
+++ b/x-pack/legacy/plugins/siem/public/register_feature.ts
@@ -6,7 +6,7 @@
import { npSetup } from 'ui/new_platform';
import { FeatureCatalogueCategory } from '../../../../../src/plugins/home/public';
-import { APP_ID } from '../common/constants';
+import { APP_ID } from '../../../../plugins/siem/common/constants';
// TODO(rylnd): move this into Plugin.setup once we're on NP
npSetup.plugins.home.featureCatalogue.register({
diff --git a/x-pack/legacy/plugins/siem/public/store/inputs/model.ts b/x-pack/legacy/plugins/siem/public/store/inputs/model.ts
index 04facf3b98c3b..e851caf523eb4 100644
--- a/x-pack/legacy/plugins/siem/public/store/inputs/model.ts
+++ b/x-pack/legacy/plugins/siem/public/store/inputs/model.ts
@@ -5,7 +5,6 @@
*/
import { Dispatch } from 'redux';
-import { Omit } from '../../../common/utility_types';
import { InputsModelId } from './constants';
import { CONSTANTS } from '../../components/url_state/constants';
import { Query, Filter, SavedQuery } from '../../../../../../../src/plugins/data/public';
diff --git a/x-pack/legacy/plugins/siem/public/utils/default_date_settings.test.ts b/x-pack/legacy/plugins/siem/public/utils/default_date_settings.test.ts
index 9dc179ba7a6e2..bb66067512d1f 100644
--- a/x-pack/legacy/plugins/siem/public/utils/default_date_settings.test.ts
+++ b/x-pack/legacy/plugins/siem/public/utils/default_date_settings.test.ts
@@ -21,7 +21,7 @@ import {
DEFAULT_INTERVAL_PAUSE,
DEFAULT_INTERVAL_VALUE,
DEFAULT_INTERVAL_TYPE,
-} from '../../common/constants';
+} from '../../../../../plugins/siem/common/constants';
import { KibanaServices } from '../lib/kibana';
import { Policy } from '../store/inputs/model';
@@ -30,7 +30,7 @@ import { Policy } from '../store/inputs/model';
// we have to repeat ourselves once
const DEFAULT_FROM_DATE = '1983-05-31T13:03:54.234Z';
const DEFAULT_TO_DATE = '1990-05-31T13:03:54.234Z';
-jest.mock('../../common/constants', () => ({
+jest.mock('../../../../../plugins/siem/common/constants', () => ({
DEFAULT_FROM: '1983-05-31T13:03:54.234Z',
DEFAULT_TO: '1990-05-31T13:03:54.234Z',
DEFAULT_INTERVAL_PAUSE: true,
diff --git a/x-pack/legacy/plugins/siem/public/utils/default_date_settings.ts b/x-pack/legacy/plugins/siem/public/utils/default_date_settings.ts
index c4869a4851ae5..89f7d34d85131 100644
--- a/x-pack/legacy/plugins/siem/public/utils/default_date_settings.ts
+++ b/x-pack/legacy/plugins/siem/public/utils/default_date_settings.ts
@@ -15,7 +15,7 @@ import {
DEFAULT_TO,
DEFAULT_INTERVAL_TYPE,
DEFAULT_INTERVAL_VALUE,
-} from '../../common/constants';
+} from '../../../../../plugins/siem/common/constants';
import { KibanaServices } from '../lib/kibana';
import { Policy } from '../store/inputs/model';
diff --git a/x-pack/legacy/plugins/siem/reporter_config.json b/x-pack/legacy/plugins/siem/reporter_config.json
deleted file mode 100644
index dda68d501f975..0000000000000
--- a/x-pack/legacy/plugins/siem/reporter_config.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "reporterEnabled": "mochawesome, mocha-junit-reporter",
- "reporterOptions": {
- "html": false,
- "json": true,
- "mochaFile": "../../../../target/kibana-siem/cypress/results/TEST-siem-cypress-[hash].xml",
- "overwrite": false,
- "reportDir": "../../../../target/kibana-siem/cypress/results"
- }
-}
diff --git a/x-pack/legacy/plugins/siem/server/index.ts b/x-pack/legacy/plugins/siem/server/index.ts
deleted file mode 100644
index 8513f871cb6c1..0000000000000
--- a/x-pack/legacy/plugins/siem/server/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { PluginInitializerContext } from '../../../../../src/core/server';
-import { Plugin } from './plugin';
-
-export const plugin = (context: PluginInitializerContext) => {
- return new Plugin(context);
-};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_with_list.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_with_list.json
deleted file mode 100644
index 997d03369a699..0000000000000
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_with_list.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "name": "Query with a list",
- "description": "Query with a list",
- "rule_id": "query-with-list",
- "risk_score": 1,
- "severity": "high",
- "type": "query",
- "query": "user.name: root or user.name: admin",
- "lists": [
- {
- "field": "source.ip",
- "values_operator": "included",
- "values_type": "exists"
- },
- {
- "field": "host.name",
- "values_operator": "excluded",
- "values_type": "match",
- "values": [
- {
- "name": "rock01"
- }
- ],
- "and": [
- {
- "field": "host.id",
- "values_operator": "included",
- "values_type": "match_all",
- "values": [
- {
- "name": "123"
- },
- {
- "name": "678"
- }
- ]
- }
- ]
- }
- ]
-}
diff --git a/x-pack/legacy/plugins/siem/server/plugin.ts b/x-pack/legacy/plugins/siem/server/plugin.ts
deleted file mode 100644
index 13b58fa1d57eb..0000000000000
--- a/x-pack/legacy/plugins/siem/server/plugin.ts
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-
-import {
- PluginStartContract as AlertingStart,
- PluginSetupContract as AlertingSetup,
-} from '../../../../plugins/alerting/server';
-import {
- CoreSetup,
- CoreStart,
- PluginInitializerContext,
- Logger,
-} from '../../../../../src/core/server';
-import { SecurityPluginSetup as SecuritySetup } from '../../../../plugins/security/server';
-import { PluginSetupContract as FeaturesSetup } from '../../../../plugins/features/server';
-import { MlPluginSetup as MlSetup } from '../../../../plugins/ml/server';
-import { EncryptedSavedObjectsPluginSetup as EncryptedSavedObjectsSetup } from '../../../../plugins/encrypted_saved_objects/server';
-import { SpacesPluginSetup as SpacesSetup } from '../../../../plugins/spaces/server';
-import { PluginStartContract as ActionsStart } from '../../../../plugins/actions/server';
-import { LicensingPluginSetup } from '../../../../plugins/licensing/server';
-import { LegacyServices } from './types';
-import { initServer } from './init_server';
-import { compose } from './lib/compose/kibana';
-import { initRoutes } from './routes';
-import { isAlertExecutor } from './lib/detection_engine/signals/types';
-import { signalRulesAlertType } from './lib/detection_engine/signals/signal_rule_alert_type';
-import { rulesNotificationAlertType } from './lib/detection_engine/notifications/rules_notification_alert_type';
-import { isNotificationAlertExecutor } from './lib/detection_engine/notifications/types';
-import {
- noteSavedObjectType,
- pinnedEventSavedObjectType,
- timelineSavedObjectType,
- ruleStatusSavedObjectType,
- ruleActionsSavedObjectType,
-} from './saved_objects';
-import { SiemClientFactory } from './client';
-import { hasListsFeature, listsEnvFeatureFlagName } from './lib/detection_engine/feature_flags';
-
-export { CoreSetup, CoreStart };
-
-export interface SetupPlugins {
- alerting: AlertingSetup;
- encryptedSavedObjects: EncryptedSavedObjectsSetup;
- features: FeaturesSetup;
- licensing: LicensingPluginSetup;
- security?: SecuritySetup;
- spaces?: SpacesSetup;
- ml?: MlSetup;
-}
-
-export interface StartPlugins {
- actions: ActionsStart;
- alerting: AlertingStart;
-}
-
-export class Plugin {
- readonly name = 'siem';
- private readonly logger: Logger;
- private context: PluginInitializerContext;
- private siemClientFactory: SiemClientFactory;
-
- constructor(context: PluginInitializerContext) {
- this.context = context;
- this.logger = context.logger.get('plugins', this.name);
- this.siemClientFactory = new SiemClientFactory();
-
- this.logger.debug('Shim plugin initialized');
- }
-
- public setup(core: CoreSetup, plugins: SetupPlugins, __legacy: LegacyServices) {
- this.logger.debug('Shim plugin setup');
- if (hasListsFeature()) {
- // TODO: Remove this once we have the lists feature supported
- this.logger.error(
- `You have activated the lists feature flag which is NOT currently supported for SIEM! You should turn this feature flag off immediately by un-setting the environment variable: ${listsEnvFeatureFlagName} and restarting Kibana`
- );
- }
-
- const router = core.http.createRouter();
- core.http.registerRouteHandlerContext(this.name, (context, request, response) => ({
- getSiemClient: () => this.siemClientFactory.create(request),
- }));
-
- this.siemClientFactory.setup({
- getSpaceId: plugins.spaces?.spacesService?.getSpaceId,
- config: __legacy.config,
- });
-
- initRoutes(
- router,
- __legacy.config,
- plugins.encryptedSavedObjects?.usingEphemeralEncryptionKey ?? false,
- plugins.security
- );
-
- plugins.features.registerFeature({
- id: this.name,
- name: i18n.translate('xpack.siem.featureRegistry.linkSiemTitle', {
- defaultMessage: 'SIEM',
- }),
- order: 1100,
- icon: 'securityAnalyticsApp',
- navLinkId: 'siem',
- app: ['siem', 'kibana'],
- catalogue: ['siem'],
- privileges: {
- all: {
- app: ['siem', 'kibana'],
- catalogue: ['siem'],
- api: ['siem', 'actions-read', 'actions-all', 'alerting-read', 'alerting-all'],
- savedObject: {
- all: [
- 'alert',
- 'action',
- 'action_task_params',
- noteSavedObjectType,
- pinnedEventSavedObjectType,
- timelineSavedObjectType,
- ruleStatusSavedObjectType,
- ruleActionsSavedObjectType,
- 'cases',
- 'cases-comments',
- 'cases-configure',
- 'cases-user-actions',
- ],
- read: ['config'],
- },
- ui: [
- 'show',
- 'crud',
- 'alerting:show',
- 'actions:show',
- 'alerting:save',
- 'actions:save',
- 'alerting:delete',
- 'actions:delete',
- ],
- },
- read: {
- app: ['siem', 'kibana'],
- catalogue: ['siem'],
- api: ['siem', 'actions-read', 'actions-all', 'alerting-read', 'alerting-all'],
- savedObject: {
- all: ['alert', 'action', 'action_task_params'],
- read: [
- 'config',
- noteSavedObjectType,
- pinnedEventSavedObjectType,
- timelineSavedObjectType,
- ruleStatusSavedObjectType,
- ruleActionsSavedObjectType,
- 'cases',
- 'cases-comments',
- 'cases-configure',
- 'cases-user-actions',
- ],
- },
- ui: [
- 'show',
- 'alerting:show',
- 'actions:show',
- 'alerting:save',
- 'actions:save',
- 'alerting:delete',
- 'actions:delete',
- ],
- },
- },
- });
-
- if (plugins.alerting != null) {
- const signalRuleType = signalRulesAlertType({
- logger: this.logger,
- version: this.context.env.packageInfo.version,
- ml: plugins.ml,
- });
- const ruleNotificationType = rulesNotificationAlertType({
- logger: this.logger,
- });
-
- if (isAlertExecutor(signalRuleType)) {
- plugins.alerting.registerType(signalRuleType);
- }
-
- if (isNotificationAlertExecutor(ruleNotificationType)) {
- plugins.alerting.registerType(ruleNotificationType);
- }
- }
-
- const libs = compose(core, plugins, this.context.env.mode.prod);
- initServer(libs);
- }
-
- public start(core: CoreStart, plugins: StartPlugins) {}
-}
diff --git a/x-pack/legacy/plugins/siem/tsconfig.json b/x-pack/legacy/plugins/siem/tsconfig.json
deleted file mode 100644
index b027bb4567b97..0000000000000
--- a/x-pack/legacy/plugins/siem/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "extends": "../../../tsconfig.json"
-}
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/uptime/README.md b/x-pack/legacy/plugins/uptime/README.md
index 2ed0e2fc77cbc..92162341ff426 100644
--- a/x-pack/legacy/plugins/uptime/README.md
+++ b/x-pack/legacy/plugins/uptime/README.md
@@ -3,7 +3,7 @@
## Purpose
The purpose of this plugin is to provide users of Heartbeat more visibility of what's happening
-in their infrastructure. It's primarily built using React and Apollo's GraphQL tools.
+in their infrastructure.
## Layout
@@ -11,13 +11,15 @@ There are three sections to the app, `common`, `public`, and `server`.
### common
-Contains GraphQL types, constants and a few other files.
+Contains runtime types types, constants and a few other files.
+
+Notably, we use `io-ts`/`fp-ts` functions and types to help provide
+additional runtime safety for our API requests/responses.
### public
-Components come in two main types, queries and functional. Queries are extended from Apollo's queries
-type which abstracts a lot of the GraphQL connectivity away. Functional are dumb components that
-don't store any state.
+We use Redux and associated tools for managing our app state. Components come in the usual `connect`ed and
+presentational varieties.
The `lib` directory controls bootstrapping code and adapter types.
@@ -27,12 +29,13 @@ The principal structure of the app is stored in `uptime_app.tsx`.
### server
-There is a `graphql` directory which contains the resolvers, schema files, and constants.
-
The `lib` directory contains `adapters`, which are connections to external resources like Kibana
Server, Elasticsearch, etc. In addition, it contains domains, which are libraries that provide
functionality via adapters.
+The `requests` directory contains functions responsible for querying Elasticsearch and parsing its
+responses.
+
There's also a `rest_api` folder that defines the structure of the RESTful API endpoints.
## Testing
diff --git a/x-pack/legacy/plugins/uptime/common/constants/context_defaults.ts b/x-pack/legacy/plugins/uptime/common/constants/context_defaults.ts
index 540e60a28b066..c6b79afd9043b 100644
--- a/x-pack/legacy/plugins/uptime/common/constants/context_defaults.ts
+++ b/x-pack/legacy/plugins/uptime/common/constants/context_defaults.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { SortOrder, CursorDirection } from '../graphql/types';
+import { CursorDirection, SortOrder } from '../runtime_types';
/**
* The Uptime UI utilizes a settings context, the defaults for which are stored here.
diff --git a/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts b/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
index dffa131870db1..9721d396625fc 100644
--- a/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
+++ b/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
@@ -7,6 +7,7 @@
export enum API_URLS {
INDEX_PATTERN = `/api/uptime/index_pattern`,
INDEX_STATUS = '/api/uptime/index_status',
+ MONITOR_LIST = `/api/uptime/monitor/list`,
MONITOR_LOCATIONS = `/api/uptime/monitor/locations`,
MONITOR_DURATION = `/api/uptime/monitor/duration`,
MONITOR_DETAILS = `/api/uptime/monitor/details`,
diff --git a/x-pack/legacy/plugins/uptime/common/graphql/types.ts b/x-pack/legacy/plugins/uptime/common/graphql/types.ts
deleted file mode 100644
index 506966ec6b5c9..0000000000000
--- a/x-pack/legacy/plugins/uptime/common/graphql/types.ts
+++ /dev/null
@@ -1,232 +0,0 @@
-/* tslint:disable */
-
-// ====================================================
-// START: Typescript template
-// ====================================================
-
-// ====================================================
-// Scalars
-// ====================================================
-
-export type UnsignedInteger = any;
-
-// ====================================================
-// Types
-// ====================================================
-
-export interface Query {
- /** Fetches the current state of Uptime monitors for the given parameters. */
- getMonitorStates?: MonitorSummaryResult | null;
-}
-
-/** The monitor's status for a ping */
-export interface Duration {
- us?: UnsignedInteger | null;
-}
-
-export interface Rtt {
- connect?: Duration | null;
-
- handshake?: Duration | null;
-
- validate?: Duration | null;
-}
-
-export interface Summary {
- up?: number | null;
-
- down?: number | null;
-
- geo?: CheckGeo | null;
-}
-
-export interface CheckGeo {
- name?: string | null;
-
- location?: Location | null;
-}
-
-export interface Location {
- lat?: number | null;
-
- lon?: number | null;
-}
-
-export interface DocCount {
- count: UnsignedInteger;
-}
-
-/** The primary object returned for monitor states. */
-export interface MonitorSummaryResult {
- /** Used to go to the next page of results */
- prevPagePagination?: string | null;
- /** Used to go to the previous page of results */
- nextPagePagination?: string | null;
- /** The objects representing the state of a series of heartbeat monitors. */
- summaries?: MonitorSummary[] | null;
- /** The number of summaries. */
- totalSummaryCount: number;
-}
-/** Represents the current state and associated data for an Uptime monitor. */
-export interface MonitorSummary {
- /** The ID assigned by the config or generated by the user. */
- monitor_id: string;
- /** The state of the monitor and its associated details. */
- state: State;
-
- histogram?: SummaryHistogram | null;
-}
-/** Unifies the subsequent data for an uptime monitor. */
-export interface State {
- /** The agent processing the monitor. */
- agent?: Agent | null;
- /** There is a check object for each instance of the monitoring agent. */
- checks?: Check[] | null;
-
- geo?: StateGeo | null;
-
- observer?: StateObserver | null;
-
- monitor?: MonitorState | null;
-
- summary: Summary;
-
- timestamp: UnsignedInteger;
- /** Transport encryption information. */
- tls?: (StateTls | null)[] | null;
-
- url?: StateUrl | null;
-}
-
-export interface Agent {
- id: string;
-}
-
-export interface Check {
- agent?: Agent | null;
-
- container?: StateContainer | null;
-
- kubernetes?: StateKubernetes | null;
-
- monitor: CheckMonitor;
-
- observer?: CheckObserver | null;
-
- timestamp: string;
-}
-
-export interface StateContainer {
- id?: string | null;
-}
-
-export interface StateKubernetes {
- pod?: StatePod | null;
-}
-
-export interface StatePod {
- uid?: string | null;
-}
-
-export interface CheckMonitor {
- ip?: string | null;
-
- name?: string | null;
-
- status: string;
-}
-
-export interface CheckObserver {
- geo?: CheckGeo | null;
-}
-
-export interface StateGeo {
- name?: (string | null)[] | null;
-
- location?: Location | null;
-}
-
-export interface StateObserver {
- geo?: StateGeo | null;
-}
-
-export interface MonitorState {
- status?: string | null;
-
- name?: string | null;
-
- id?: string | null;
-
- type?: string | null;
-}
-/** Contains monitor transmission encryption information. */
-export interface StateTls {
- /** The date and time after which the certificate is invalid. */
- certificate_not_valid_after?: string | null;
-
- certificate_not_valid_before?: string | null;
-
- certificates?: string | null;
-
- rtt?: Rtt | null;
-}
-
-export interface StateUrl {
- domain?: string | null;
-
- full?: string | null;
-
- path?: string | null;
-
- port?: number | null;
-
- scheme?: string | null;
-}
-/** Monitor status data over time. */
-export interface SummaryHistogram {
- /** The number of documents used to assemble the histogram. */
- count: number;
- /** The individual histogram data points. */
- points: SummaryHistogramPoint[];
-}
-/** Represents a monitor's statuses for a period of time. */
-export interface SummaryHistogramPoint {
- /** The time at which these data were collected. */
- timestamp: UnsignedInteger;
- /** The number of _up_ documents. */
- up: number;
- /** The number of _down_ documents. */
- down: number;
-}
-
-export interface GetMonitorStatesQueryArgs {
- dateRangeStart: string;
-
- dateRangeEnd: string;
-
- pagination?: string | null;
-
- filters?: string | null;
-
- statusFilter?: string | null;
-
- pageSize: number;
-}
-
-// ====================================================
-// Enums
-// ====================================================
-
-export enum CursorDirection {
- AFTER = 'AFTER',
- BEFORE = 'BEFORE',
-}
-
-export enum SortOrder {
- ASC = 'ASC',
- DESC = 'DESC',
-}
-
-// ====================================================
-// END: Typescript template
-// ====================================================
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/dynamic_settings.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/dynamic_settings.ts
index 8dedd4672eeae..985b51891da99 100644
--- a/x-pack/legacy/plugins/uptime/common/runtime_types/dynamic_settings.ts
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/dynamic_settings.ts
@@ -6,10 +6,20 @@
import * as t from 'io-ts';
-export const DynamicSettingsType = t.type({
- heartbeatIndices: t.string,
+export const CertificatesStatesThresholdType = t.interface({
+ warningState: t.number,
+ errorState: t.number,
});
+export const DynamicSettingsType = t.intersection([
+ t.type({
+ heartbeatIndices: t.string,
+ }),
+ t.partial({
+ certificatesThresholds: CertificatesStatesThresholdType,
+ }),
+]);
+
export const DynamicSettingsSaveType = t.intersection([
t.type({
success: t.boolean,
@@ -21,7 +31,12 @@ export const DynamicSettingsSaveType = t.intersection([
export type DynamicSettings = t.TypeOf;
export type DynamicSettingsSaveResponse = t.TypeOf;
+export type CertificatesStatesThreshold = t.TypeOf;
export const defaultDynamicSettings: DynamicSettings = {
heartbeatIndices: 'heartbeat-8*',
+ certificatesThresholds: {
+ errorState: 7,
+ warningState: 30,
+ },
};
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/index.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/index.ts
index 80b48d09dc5b8..46b19d8442a94 100644
--- a/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/index.ts
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/index.ts
@@ -6,3 +6,4 @@
export * from './details';
export * from './locations';
+export * from './state';
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/state.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/state.ts
new file mode 100644
index 0000000000000..90aa692f89a42
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/state.ts
@@ -0,0 +1,145 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as t from 'io-ts';
+
+export const CheckMonitorType = t.intersection([
+ t.partial({
+ name: t.string,
+ ip: t.union([t.array(t.string), t.string]),
+ }),
+ t.type({
+ status: t.string,
+ }),
+]);
+
+export const CheckType = t.intersection([
+ t.partial({
+ agent: t.partial({
+ id: t.string,
+ }),
+ container: t.type({
+ id: t.string,
+ }),
+ kubernetes: t.type({
+ pod: t.type({
+ uid: t.string,
+ }),
+ }),
+ observer: t.type({
+ geo: t.partial({
+ name: t.string,
+ location: t.partial({
+ lat: t.number,
+ lon: t.number,
+ }),
+ }),
+ }),
+ }),
+ t.type({
+ monitor: CheckMonitorType,
+ timestamp: t.number,
+ }),
+]);
+
+export type Check = t.TypeOf;
+
+export const StateType = t.intersection([
+ t.partial({
+ checks: t.array(CheckType),
+ observer: t.partial({
+ geo: t.partial({
+ name: t.array(t.string),
+ }),
+ }),
+ summary: t.partial({
+ up: t.number,
+ down: t.number,
+ geo: t.partial({
+ name: t.string,
+ location: t.partial({
+ lat: t.number,
+ lon: t.number,
+ }),
+ }),
+ }),
+ }),
+ t.type({
+ timestamp: t.string,
+ url: t.partial({
+ domain: t.string,
+ full: t.string,
+ path: t.string,
+ port: t.number,
+ scheme: t.string,
+ }),
+ }),
+]);
+
+export const HistogramPointType = t.type({
+ timestamp: t.number,
+ up: t.number,
+ down: t.number,
+});
+
+export type HistogramPoint = t.TypeOf;
+
+export const HistogramType = t.type({
+ count: t.number,
+ points: t.array(HistogramPointType),
+});
+
+export type Histogram = t.TypeOf;
+
+export const MonitorSummaryType = t.intersection([
+ t.type({
+ monitor_id: t.string,
+ state: StateType,
+ }),
+ t.partial({
+ histogram: HistogramType,
+ }),
+]);
+
+export type MonitorSummary = t.TypeOf;
+
+export const MonitorSummaryResultType = t.intersection([
+ t.partial({
+ summaries: t.array(MonitorSummaryType),
+ }),
+ t.type({
+ prevPagePagination: t.union([t.string, t.null]),
+ nextPagePagination: t.union([t.string, t.null]),
+ totalSummaryCount: t.number,
+ }),
+]);
+
+export type MonitorSummaryResult = t.TypeOf;
+
+export const FetchMonitorStatesQueryArgsType = t.intersection([
+ t.partial({
+ pagination: t.string,
+ filters: t.string,
+ statusFilter: t.string,
+ }),
+ t.type({
+ dateRangeStart: t.string,
+ dateRangeEnd: t.string,
+ pageSize: t.number,
+ }),
+]);
+
+export type FetchMonitorStatesQueryArgs = t.TypeOf;
+
+export enum CursorDirection {
+ AFTER = 'AFTER',
+ BEFORE = 'BEFORE',
+}
+
+export enum SortOrder {
+ ASC = 'ASC',
+ DESC = 'DESC',
+}
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/index.ts b/x-pack/legacy/plugins/uptime/public/components/connected/index.ts
index be3cc5b65aa0e..94e2529a46a00 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/index.ts
@@ -11,6 +11,7 @@ export { KueryBar } from './kuerybar/kuery_bar_container';
export { FilterGroup } from './filter_group/filter_group_container';
export { MonitorStatusDetails } from './monitor/status_details_container';
export { MonitorStatusBar } from './monitor/status_bar_container';
+export { MonitorList } from './monitor/monitor_list';
export { MonitorListDrawer } from './monitor/list_drawer_container';
export { MonitorListActionsPopover } from './monitor/drawer_popover_container';
export { PingList, PingListProps } from './pings';
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/list_drawer_container.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/list_drawer_container.tsx
index 70da62d5833af..37a96ba0396aa 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/list_drawer_container.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/list_drawer_container.tsx
@@ -12,8 +12,7 @@ import { MonitorDetailsActionPayload } from '../../../state/actions/types';
import { getMonitorDetailsAction } from '../../../state/actions/monitor';
import { MonitorListDrawerComponent } from '../../functional/monitor_list/monitor_list_drawer/monitor_list_drawer';
import { useGetUrlParams } from '../../../hooks';
-import { MonitorSummary } from '../../../../common/graphql/types';
-import { MonitorDetails } from '../../../../common/runtime_types/monitor';
+import { MonitorDetails, MonitorSummary } from '../../../../common/runtime_types';
interface ContainerProps {
summary: MonitorSummary;
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/monitor_list.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/monitor_list.tsx
new file mode 100644
index 0000000000000..c9457664566b7
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/monitor_list.tsx
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import { getMonitorList } from '../../../state/actions';
+import { FetchMonitorStatesQueryArgs } from '../../../../common/runtime_types';
+import { monitorListSelector } from '../../../state/selectors';
+import { MonitorListComponent } from '../../functional/monitor_list';
+
+export interface MonitorListProps {
+ filters?: string;
+ linkParameters?: string;
+}
+
+export const MonitorList: React.FC = props => {
+ const dispatch = useDispatch();
+ const dispatchCallback = useCallback(
+ (params: FetchMonitorStatesQueryArgs) => {
+ dispatch(getMonitorList(params));
+ },
+ [dispatch]
+ );
+ const monitorListState = useSelector(monitorListSelector);
+ return (
+
+ );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
index 8ca73879cab8c..b389139d71dbf 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
@@ -82,7 +82,6 @@ exports[`MonitorBarSeries component shallow renders a series when there are down
}
>
{
let props: MonitorBarSeriesProps;
- let histogramSeries: SummaryHistogramPoint[];
+ let histogramSeries: HistogramPoint[];
beforeEach(() => {
props = {
- dangerColor: 'A danger color',
histogramSeries: [
{
timestamp: 124,
@@ -193,16 +192,12 @@ describe('MonitorBarSeries component', () => {
});
it('shallow renders nothing if the data series is null', () => {
- const component = shallowWithRouter(
-
- );
+ const component = shallowWithRouter();
expect(component).toEqual({});
});
it('renders if the data series is present', () => {
- const component = renderWithRouter(
-
- );
+ const component = renderWithRouter();
expect(component).toMatchSnapshot();
});
});
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx
index d149e7a6deb5a..ec2081d715554 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx
@@ -9,8 +9,7 @@ import { i18n } from '@kbn/i18n';
import moment from 'moment';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiTitle } from '@elastic/eui';
-import { Axis, Chart, Position, timeFormatter, Settings } from '@elastic/charts';
-import { SeriesIdentifier } from '@elastic/charts/dist/chart_types/xy_chart/utils/series';
+import { Axis, Chart, Position, timeFormatter, Settings, SeriesIdentifier } from '@elastic/charts';
import { getChartDateLabel } from '../../../lib/helper';
import { LocationDurationLine } from '../../../../common/types';
import { DurationLineSeriesList } from './duration_line_series_list';
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/monitor_bar_series.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/monitor_bar_series.tsx
index 6a1e255d308d7..5e11685e36140 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/monitor_bar_series.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/monitor_bar_series.tsx
@@ -14,23 +14,20 @@ import {
timeFormatter,
} from '@elastic/charts';
import { i18n } from '@kbn/i18n';
-import React from 'react';
+import React, { useContext } from 'react';
import moment from 'moment';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiText, EuiToolTip } from '@elastic/eui';
-import { SummaryHistogramPoint } from '../../../../common/graphql/types';
+import { HistogramPoint } from '../../../../common/runtime_types';
import { getChartDateLabel, seriesHasDownValues } from '../../../lib/helper';
import { useUrlParams } from '../../../hooks';
+import { UptimeThemeContext } from '../../../contexts';
export interface MonitorBarSeriesProps {
- /**
- * The color to use for the display of down states.
- */
- dangerColor: string;
/**
* The timeseries data to display.
*/
- histogramSeries: SummaryHistogramPoint[] | null;
+ histogramSeries: HistogramPoint[] | null;
}
/**
@@ -38,7 +35,10 @@ export interface MonitorBarSeriesProps {
* so we will only render the series component if there are down counts for the selected monitor.
* @param props - the values for the monitor this chart visualizes
*/
-export const MonitorBarSeries = ({ dangerColor, histogramSeries }: MonitorBarSeriesProps) => {
+export const MonitorBarSeries = ({ histogramSeries }: MonitorBarSeriesProps) => {
+ const {
+ colors: { danger },
+ } = useContext(UptimeThemeContext);
const [getUrlParams, updateUrlParams] = useUrlParams();
const { absoluteDateRangeStart, absoluteDateRangeEnd } = getUrlParams();
@@ -68,7 +68,7 @@ export const MonitorBarSeries = ({ dangerColor, histogramSeries }: MonitorBarSer
/>
[timestamp, down])}
name={i18n.translate('xpack.uptime.monitorList.downLineSeries.downLabel', {
defaultMessage: 'Down checks',
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/index.ts b/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
index d82912a6216e8..07809561c31b7 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
@@ -13,7 +13,7 @@ export * from './alerts';
export { DonutChart } from './charts/donut_chart';
export { KueryBarComponent } from './kuery_bar/kuery_bar';
export { MonitorCharts } from './monitor_charts';
-export { MonitorList } from './monitor_list';
+export { MonitorListComponent } from './monitor_list';
export { OverviewPageParsingErrorCallout } from './overview_page_parsing_error_callout';
export { PingListComponent } from './ping_list';
export { PingHistogramComponent } from './charts';
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
index 2b8bc0bb06ddf..ed5602323d254 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
@@ -1,125 +1,535 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`MonitorList component renders a no items message when no data is provided 1`] = `
-
-
-
-
-
-
-
-
-
+
+
+`;
+
+exports[`MonitorList component MonitorListPagination component renders the pagination 1`] = `
+
+
+
+`;
+
+exports[`MonitorList component renders a no items message when no data is provided 1`] = `
+
+
+
+`;
+
+exports[`MonitorList component renders error list 1`] = `
+
+
+
+`;
+
+exports[`MonitorList component renders loading state 1`] = `
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ }
+ />
+
`;
exports[`MonitorList component renders the monitor list 1`] = `
@@ -672,185 +1082,132 @@ exports[`MonitorList component renders the monitor list 1`] = `
`;
exports[`MonitorList component shallow renders the monitor list 1`] = `
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ }
+ />
+
`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_pagination.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_pagination.test.tsx.snap
deleted file mode 100644
index db5bfa72deb36..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_pagination.test.tsx.snap
+++ /dev/null
@@ -1,307 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`MonitorListPagination component renders a no items message when no data is provided 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`MonitorListPagination component renders the monitor list 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list.test.tsx
index d2030155d0092..9b1d799a23e37 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list.test.tsx
@@ -4,17 +4,30 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { shallowWithIntl } from 'test_utils/enzyme_helpers';
import React from 'react';
-import { MonitorSummaryResult } from '../../../../../common/graphql/types';
+import {
+ MonitorSummaryResult,
+ CursorDirection,
+ SortOrder,
+} from '../../../../../common/runtime_types';
import { MonitorListComponent } from '../monitor_list';
-import { renderWithRouter } from '../../../../lib';
+import { renderWithRouter, shallowWithRouter } from '../../../../lib';
describe('MonitorList component', () => {
let result: MonitorSummaryResult;
+ let localStorageMock: any;
beforeEach(() => {
+ localStorageMock = {
+ getItem: jest.fn().mockImplementation(() => '25'),
+ setItem: jest.fn(),
+ };
+
+ // @ts-ignore replacing a call to localStorage we use for monitor list size
+ global.localStorage = localStorageMock;
result = {
+ nextPagePagination: null,
+ prevPagePagination: null,
summaries: [
{
monitor_id: 'foo',
@@ -25,21 +38,21 @@ describe('MonitorList component', () => {
ip: '127.0.0.1',
status: 'up',
},
- timestamp: '124',
+ timestamp: 124,
},
{
monitor: {
ip: '127.0.0.2',
status: 'down',
},
- timestamp: '125',
+ timestamp: 125,
},
{
monitor: {
ip: '127.0.0.3',
status: 'down',
},
- timestamp: '126',
+ timestamp: 126,
},
],
summary: {
@@ -47,6 +60,7 @@ describe('MonitorList component', () => {
down: 2,
},
timestamp: '123',
+ url: {},
},
},
{
@@ -58,14 +72,14 @@ describe('MonitorList component', () => {
ip: '127.0.0.1',
status: 'up',
},
- timestamp: '125',
+ timestamp: 125,
},
{
monitor: {
ip: '127.0.0.2',
status: 'up',
},
- timestamp: '126',
+ timestamp: 126,
},
],
summary: {
@@ -73,6 +87,7 @@ describe('MonitorList component', () => {
down: 0,
},
timestamp: '125',
+ url: {},
},
},
],
@@ -81,15 +96,11 @@ describe('MonitorList component', () => {
});
it('shallow renders the monitor list', () => {
- const component = shallowWithIntl(
+ const component = shallowWithRouter(
);
@@ -97,15 +108,19 @@ describe('MonitorList component', () => {
});
it('renders a no items message when no data is provided', () => {
- const component = shallowWithIntl(
+ const component = shallowWithRouter(
);
expect(component).toMatchSnapshot();
@@ -114,16 +129,156 @@ describe('MonitorList component', () => {
it('renders the monitor list', () => {
const component = renderWithRouter(
+ );
+
+ expect(component).toMatchSnapshot();
+ });
+
+ it('renders error list', () => {
+ const component = shallowWithRouter(
+
);
expect(component).toMatchSnapshot();
});
+
+ it('renders loading state', () => {
+ const component = shallowWithRouter(
+
+ );
+
+ expect(component).toMatchSnapshot();
+ });
+
+ describe('MonitorListPagination component', () => {
+ let paginationResult: MonitorSummaryResult;
+
+ beforeEach(() => {
+ paginationResult = {
+ prevPagePagination: JSON.stringify({
+ cursorKey: { monitor_id: 123 },
+ cursorDirection: CursorDirection.BEFORE,
+ sortOrder: SortOrder.ASC,
+ }),
+ nextPagePagination: JSON.stringify({
+ cursorKey: { monitor_id: 456 },
+ cursorDirection: CursorDirection.AFTER,
+ sortOrder: SortOrder.ASC,
+ }),
+ summaries: [
+ {
+ monitor_id: 'foo',
+ state: {
+ checks: [
+ {
+ monitor: {
+ ip: '127.0.0.1',
+ status: 'up',
+ },
+ timestamp: 124,
+ },
+ {
+ monitor: {
+ ip: '127.0.0.2',
+ status: 'down',
+ },
+ timestamp: 125,
+ },
+ {
+ monitor: {
+ ip: '127.0.0.3',
+ status: 'down',
+ },
+ timestamp: 126,
+ },
+ ],
+ summary: {
+ up: 1,
+ down: 2,
+ },
+ timestamp: '123',
+ url: {},
+ },
+ },
+ {
+ monitor_id: 'bar',
+ state: {
+ checks: [
+ {
+ monitor: {
+ ip: '127.0.0.1',
+ status: 'up',
+ },
+ timestamp: 125,
+ },
+ {
+ monitor: {
+ ip: '127.0.0.2',
+ status: 'up',
+ },
+ timestamp: 126,
+ },
+ ],
+ summary: {
+ up: 2,
+ down: 0,
+ },
+ timestamp: '125',
+ url: {},
+ },
+ },
+ ],
+ totalSummaryCount: 2,
+ };
+ });
+
+ it('renders the pagination', () => {
+ const component = shallowWithRouter(
+
+ );
+
+ expect(component).toMatchSnapshot();
+ });
+
+ it('renders a no items message when no data is provided', () => {
+ const component = shallowWithRouter(
+
+ );
+
+ expect(component).toMatchSnapshot();
+ });
+ });
});
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_pagination.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_pagination.test.tsx
deleted file mode 100644
index b08b8b3fabc3e..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_pagination.test.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import React from 'react';
-import {
- CursorDirection,
- MonitorSummaryResult,
- SortOrder,
-} from '../../../../../common/graphql/types';
-import { MonitorListComponent } from '../monitor_list';
-
-describe('MonitorListPagination component', () => {
- let result: MonitorSummaryResult;
-
- beforeEach(() => {
- result = {
- prevPagePagination: JSON.stringify({
- cursorKey: { monitor_id: 123 },
- cursorDirection: CursorDirection.BEFORE,
- sortOrder: SortOrder.ASC,
- }),
- nextPagePagination: JSON.stringify({
- cursorKey: { monitor_id: 456 },
- cursorDirection: CursorDirection.AFTER,
- sortOrder: SortOrder.ASC,
- }),
- summaries: [
- {
- monitor_id: 'foo',
- state: {
- checks: [
- {
- monitor: {
- ip: '127.0.0.1',
- status: 'up',
- },
- timestamp: '124',
- },
- {
- monitor: {
- ip: '127.0.0.2',
- status: 'down',
- },
- timestamp: '125',
- },
- {
- monitor: {
- ip: '127.0.0.3',
- status: 'down',
- },
- timestamp: '126',
- },
- ],
- summary: {
- up: 1,
- down: 2,
- },
- timestamp: '123',
- },
- },
- {
- monitor_id: 'bar',
- state: {
- checks: [
- {
- monitor: {
- ip: '127.0.0.1',
- status: 'up',
- },
- timestamp: '125',
- },
- {
- monitor: {
- ip: '127.0.0.2',
- status: 'up',
- },
- timestamp: '126',
- },
- ],
- summary: {
- up: 2,
- down: 0,
- },
- timestamp: '125',
- },
- },
- ],
- totalSummaryCount: 2,
- };
- });
-
- it('renders the monitor list', () => {
- const component = shallowWithIntl(
-
- );
-
- expect(component).toMatchSnapshot();
- });
-
- it('renders a no items message when no data is provided', () => {
- const component = shallowWithIntl(
-
- );
- expect(component).toMatchSnapshot();
- });
-});
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_status_column.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_status_column.test.tsx
index 406e18535f34c..d765c0b33ea4b 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_status_column.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_status_column.test.tsx
@@ -8,7 +8,7 @@ import React from 'react';
import moment from 'moment';
import { renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
import { getLocationStatus, MonitorListStatusColumn } from '../monitor_list_status_column';
-import { Check } from '../../../../../common/graphql/types';
+import { Check } from '../../../../../common/runtime_types';
import { STATUS } from '../../../../../common/constants';
describe('MonitorListStatusColumn', () => {
@@ -29,9 +29,6 @@ describe('MonitorListStatusColumn', () => {
beforeEach(() => {
upChecks = [
{
- agent: { id: '6a2f2a1c-e346-49ed-8418-6d48af8841d6' },
- container: null,
- kubernetes: null,
monitor: {
ip: '104.86.46.103',
name: '',
@@ -46,12 +43,9 @@ describe('MonitorListStatusColumn', () => {
},
},
},
- timestamp: '1579794631464',
+ timestamp: 1579794631464,
},
{
- agent: { id: '1117fd01-bc1a-4aa5-bfab-40ab455eadf9' },
- container: null,
- kubernetes: null,
monitor: {
ip: '104.86.46.103',
name: '',
@@ -66,12 +60,9 @@ describe('MonitorListStatusColumn', () => {
},
},
},
- timestamp: '1579794634220',
+ timestamp: 1579794634220,
},
{
- agent: { id: 'eda59510-45e8-4dfe-b0f8-959c449e3565' },
- container: null,
- kubernetes: null,
monitor: {
ip: '104.86.46.103',
name: '',
@@ -86,15 +77,12 @@ describe('MonitorListStatusColumn', () => {
},
},
},
- timestamp: '1579794628368',
+ timestamp: 1579794628368,
},
];
downChecks = [
{
- agent: { id: '6a2f2a1c-e346-49ed-8418-6d48af8841d6' },
- container: null,
- kubernetes: null,
monitor: {
ip: '104.86.46.103',
name: '',
@@ -109,12 +97,9 @@ describe('MonitorListStatusColumn', () => {
},
},
},
- timestamp: '1579794631464',
+ timestamp: 1579794631464,
},
{
- agent: { id: '1117fd01-bc1a-4aa5-bfab-40ab455eadf9' },
- container: null,
- kubernetes: null,
monitor: {
ip: '104.86.46.103',
name: '',
@@ -129,12 +114,9 @@ describe('MonitorListStatusColumn', () => {
},
},
},
- timestamp: '1579794634220',
+ timestamp: 1579794634220,
},
{
- agent: { id: 'eda59510-45e8-4dfe-b0f8-959c449e3565' },
- container: null,
- kubernetes: null,
monitor: {
ip: '104.86.46.103',
name: '',
@@ -149,15 +131,12 @@ describe('MonitorListStatusColumn', () => {
},
},
},
- timestamp: '1579794628368',
+ timestamp: 1579794628368,
},
];
checks = [
{
- agent: { id: '6a2f2a1c-e346-49ed-8418-6d48af8841d6' },
- container: null,
- kubernetes: null,
monitor: {
ip: '104.86.46.103',
name: '',
@@ -172,12 +151,9 @@ describe('MonitorListStatusColumn', () => {
},
},
},
- timestamp: '1579794631464',
+ timestamp: 1579794631464,
},
{
- agent: { id: '1117fd01-bc1a-4aa5-bfab-40ab455eadf9' },
- container: null,
- kubernetes: null,
monitor: {
ip: '104.86.46.103',
name: '',
@@ -192,12 +168,9 @@ describe('MonitorListStatusColumn', () => {
},
},
},
- timestamp: '1579794634220',
+ timestamp: 1579794634220,
},
{
- agent: { id: 'eda59510-45e8-4dfe-b0f8-959c449e3565' },
- container: null,
- kubernetes: null,
monitor: {
ip: '104.86.46.103',
name: '',
@@ -212,7 +185,7 @@ describe('MonitorListStatusColumn', () => {
},
},
},
- timestamp: '1579794628368',
+ timestamp: 1579794628368,
},
];
});
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/index.ts b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/index.ts
index a83330a7a3a0b..2dc43050f9515 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/index.ts
@@ -4,6 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-export { MonitorList } from './monitor_list';
+export { MonitorListComponent } from './monitor_list';
export { Criteria, Pagination } from './types';
export { LocationLink } from './monitor_list_drawer';
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx
index a9fb1ce2f4be1..6705101ccd572 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx
@@ -16,17 +16,11 @@ import {
EuiTitle,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
import styled from 'styled-components';
-import { withUptimeGraphQL, UptimeGraphQLQueryProps } from '../../higher_order';
-import { monitorStatesQuery } from '../../../queries/monitor_states_query';
-import {
- MonitorSummary,
- MonitorSummaryResult,
- SummaryHistogramPoint,
-} from '../../../../common/graphql/types';
+import { HistogramPoint, FetchMonitorStatesQueryArgs } from '../../../../common/runtime_types';
+import { MonitorSummary } from '../../../../common/runtime_types';
import { MonitorListStatusColumn } from './monitor_list_status_column';
-import { formatUptimeGraphQLErrorList } from '../../../lib/helper/format_error_list';
import { ExpandedRowMap } from './types';
import { MonitorBarSeries } from '../charts';
import { MonitorPageLink } from './monitor_page_link';
@@ -34,36 +28,69 @@ import { OverviewPageLink } from './overview_page_link';
import * as labels from './translations';
import { MonitorListDrawer } from '../../connected';
import { MonitorListPageSizeSelect } from './monitor_list_page_size_select';
+import { MonitorListProps } from '../../connected/monitor/monitor_list';
+import { MonitorList } from '../../../state/reducers/monitor_list';
+import { useUrlParams } from '../../../hooks';
-interface MonitorListQueryResult {
- monitorStates?: MonitorSummaryResult;
-}
-
-interface MonitorListProps {
- dangerColor: string;
- hasActiveFilters: boolean;
- successColor: string;
- linkParameters?: string;
- pageSize: number;
- setPageSize: (size: number) => void;
+interface Props extends MonitorListProps {
+ lastRefresh: number;
+ monitorList: MonitorList;
+ getMonitorList: (params: FetchMonitorStatesQueryArgs) => void;
}
-type Props = UptimeGraphQLQueryProps & MonitorListProps;
-
const TruncatedEuiLink = styled(EuiLink)`
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
`;
-export const MonitorListComponent = (props: Props) => {
- const { dangerColor, data, errors, hasActiveFilters, linkParameters, loading } = props;
+const DEFAULT_PAGE_SIZE = 10;
+const LOCAL_STORAGE_KEY = 'xpack.uptime.monitorList.pageSize';
+const getPageSizeValue = () => {
+ const value = parseInt(localStorage.getItem(LOCAL_STORAGE_KEY) ?? '', 10);
+ if (isNaN(value)) {
+ return DEFAULT_PAGE_SIZE;
+ }
+ return value;
+};
+
+export const MonitorListComponent: React.FC = ({
+ filters,
+ getMonitorList,
+ lastRefresh,
+ monitorList: { list, error, loading },
+ linkParameters,
+}) => {
+ const [pageSize, setPageSize] = useState(getPageSizeValue());
const [drawerIds, updateDrawerIds] = useState([]);
- const items = data?.monitorStates?.summaries ?? [];
+ const [getUrlValues] = useUrlParams();
+ const { dateRangeStart, dateRangeEnd, pagination, statusFilter } = getUrlValues();
+
+ useEffect(() => {
+ getMonitorList({
+ dateRangeStart,
+ dateRangeEnd,
+ filters,
+ pageSize,
+ pagination,
+ statusFilter,
+ });
+ }, [
+ getMonitorList,
+ dateRangeStart,
+ dateRangeEnd,
+ filters,
+ lastRefresh,
+ pageSize,
+ pagination,
+ statusFilter,
+ ]);
+
+ const items = list.summaries ?? [];
- const nextPagePagination = data?.monitorStates?.nextPagePagination ?? '';
- const prevPagePagination = data?.monitorStates?.prevPagePagination ?? '';
+ const nextPagePagination = list.nextPagePagination ?? '';
+ const prevPagePagination = list.prevPagePagination ?? '';
const getExpandedRowMap = () => {
return drawerIds.reduce((map: ExpandedRowMap, id: string) => {
@@ -123,8 +150,8 @@ export const MonitorListComponent = (props: Props) => {
mobileOptions: {
show: false,
},
- render: (histogramSeries: SummaryHistogramPoint[] | null) => (
-
+ render: (histogramSeries: HistogramPoint[] | null) => (
+
),
},
{
@@ -153,70 +180,61 @@ export const MonitorListComponent = (props: Props) => {
];
return (
- <>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
);
};
-
-export const MonitorList = withUptimeGraphQL(
- MonitorListComponent,
- monitorStatesQuery
-);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
index cf754581b1a33..4520b760be379 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
@@ -71,21 +71,21 @@ exports[`MonitorListDrawer component renders a MonitorListDrawer when there are
"ip": "127.0.0.1",
"status": "up",
},
- "timestamp": "121",
+ "timestamp": 121,
},
Object {
"monitor": Object {
"ip": "127.0.0.2",
"status": "down",
},
- "timestamp": "123",
+ "timestamp": 123,
},
Object {
"monitor": Object {
"ip": "127.0.0.3",
"status": "up",
},
- "timestamp": "125",
+ "timestamp": 125,
},
],
"summary": Object {
@@ -175,7 +175,7 @@ exports[`MonitorListDrawer component renders a MonitorListDrawer when there is o
"ip": "127.0.0.1",
"status": "up",
},
- "timestamp": "121",
+ "timestamp": 121,
},
],
"summary": Object {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/integration_group.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/integration_group.test.tsx
index 723f8f9f4430a..48fa2c9766681 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/integration_group.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/integration_group.test.tsx
@@ -5,7 +5,7 @@
*/
import React from 'react';
-import { MonitorSummary } from '../../../../../../common/graphql/types';
+import { MonitorSummary } from '../../../../../../common/runtime_types';
import { shallowWithIntl } from 'test_utils/enzyme_helpers';
import { IntegrationGroup } from '../integration_group';
@@ -19,6 +19,7 @@ describe('IntegrationGroup', () => {
summary: {},
checks: [],
timestamp: '123',
+ url: {},
},
};
});
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
index d870acefaaea6..4bc0c3f0a40ba 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
@@ -4,10 +4,9 @@
* you may not use this file except in compliance with the Elastic License.
*/
import 'jest';
-import { MonitorSummary, Check } from '../../../../../../common/graphql/types';
import React from 'react';
import { MonitorListDrawerComponent } from '../monitor_list_drawer';
-import { MonitorDetails } from '../../../../../../common/runtime_types';
+import { Check, MonitorDetails, MonitorSummary } from '../../../../../../common/runtime_types';
import { shallowWithRouter } from '../../../../../lib';
describe('MonitorListDrawer component', () => {
@@ -24,7 +23,7 @@ describe('MonitorListDrawer component', () => {
ip: '127.0.0.1',
status: 'up',
},
- timestamp: '121',
+ timestamp: 121,
},
],
summary: {
@@ -77,21 +76,21 @@ describe('MonitorListDrawer component', () => {
ip: '127.0.0.1',
status: 'up',
},
- timestamp: '121',
+ timestamp: 121,
},
{
monitor: {
ip: '127.0.0.2',
status: 'down',
},
- timestamp: '123',
+ timestamp: 123,
},
{
monitor: {
ip: '127.0.0.3',
status: 'up',
},
- timestamp: '125',
+ timestamp: 125,
},
];
summary.state.checks = checks;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_status_list.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_status_list.test.tsx
index 8c07d0b1a7d22..c7f3aef4075e1 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_status_list.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_status_list.test.tsx
@@ -8,7 +8,7 @@ import { shallowWithIntl } from 'test_utils/enzyme_helpers';
import React from 'react';
import moment from 'moment';
import { MonitorStatusList } from '../monitor_status_list';
-import { Check } from '../../../../../../common/graphql/types';
+import { Check } from '../../../../../../common/runtime_types';
describe('MonitorStatusList component', () => {
let checks: Check[];
@@ -21,110 +21,92 @@ describe('MonitorStatusList component', () => {
beforeEach(() => {
checks = [
{
- agent: { id: '8f9a37fb-573a-4fdc-9895-440a5b39c250' },
monitor: {
ip: '151.101.130.217',
name: 'elastic',
status: 'up',
},
observer: {
- geo: { name: null, location: null },
+ geo: {},
},
- timestamp: '1570538236414',
+ timestamp: 1570538236414,
},
{
- agent: { id: '8f9a37fb-573a-4fdc-9895-440a5b39c250' },
monitor: {
ip: '151.101.194.217',
name: 'elastic',
status: 'up',
},
observer: {
- geo: { name: null, location: null },
+ geo: {},
},
- timestamp: '1570538236414',
+ timestamp: 1570538236414,
},
{
- agent: { id: '8f9a37fb-573a-4fdc-9895-440a5b39c250' },
monitor: {
ip: '151.101.2.217',
name: 'elastic',
status: 'up',
},
observer: {
- geo: { name: null, location: null },
+ geo: {},
},
- timestamp: '1570538236414',
+ timestamp: 1570538236414,
},
{
- agent: { id: '8f9a37fb-573a-4fdc-9895-440a5b39c250' },
- container: null,
- kubernetes: null,
monitor: {
ip: '151.101.66.217',
name: 'elastic',
status: 'up',
},
observer: {
- geo: { name: null, location: null },
+ geo: {},
},
- timestamp: '1570538236414',
+ timestamp: 1570538236414,
},
{
- agent: { id: '8f9a37fb-573a-4fdc-9895-440a5b39c250' },
- container: null,
- kubernetes: null,
monitor: {
ip: '2a04:4e42:200::729',
name: 'elastic',
status: 'down',
},
observer: {
- geo: { name: null, location: null },
+ geo: {},
},
- timestamp: '1570538236414',
+ timestamp: 1570538236414,
},
{
- agent: { id: '8f9a37fb-573a-4fdc-9895-440a5b39c250' },
- container: null,
- kubernetes: null,
monitor: {
ip: '2a04:4e42:400::729',
name: 'elastic',
status: 'down',
},
observer: {
- geo: { name: null, location: null },
+ geo: {},
},
- timestamp: '1570538236414',
+ timestamp: 1570538236414,
},
{
- agent: { id: '8f9a37fb-573a-4fdc-9895-440a5b39c250' },
- container: null,
- kubernetes: null,
monitor: {
ip: '2a04:4e42:600::729',
name: 'elastic',
status: 'down',
},
observer: {
- geo: { name: null, location: null },
+ geo: {},
},
- timestamp: '1570538236414',
+ timestamp: 1570538236414,
},
{
- agent: { id: '8f9a37fb-573a-4fdc-9895-440a5b39c250' },
- container: null,
- kubernetes: null,
monitor: {
ip: '2a04:4e42::729',
name: 'elastic',
status: 'down',
},
observer: {
- geo: { name: null, location: null },
+ geo: {},
},
- timestamp: '1570538236414',
+ timestamp: 1570538236414,
},
];
});
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/integration_group.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/integration_group.tsx
index 34bff58a3e2d9..cc06b9a2306c7 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/integration_group.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/integration_group.tsx
@@ -19,7 +19,7 @@ import {
getLoggingIpHref,
getLoggingKubernetesHref,
} from '../../../../lib/helper';
-import { MonitorSummary } from '../../../../../common/graphql/types';
+import { MonitorSummary } from '../../../../../common/runtime_types';
import { UptimeSettingsContext } from '../../../../contexts';
interface IntegrationGroupProps {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_actions_popover.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_actions_popover.tsx
index 6b946baa8d403..c57ecbaa4d3ed 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_actions_popover.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_actions_popover.tsx
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
import React from 'react';
import { EuiPopover, EuiButton } from '@elastic/eui';
import { IntegrationGroup } from './integration_group';
-import { MonitorSummary } from '../../../../../common/graphql/types';
+import { MonitorSummary } from '../../../../../common/runtime_types';
import { toggleIntegrationsPopover, PopoverState } from '../../../../state/actions';
interface MonitorListActionsPopoverProps {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
index 8383596ccc346..6dc9ebbef1287 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
@@ -7,10 +7,9 @@
import React from 'react';
import styled from 'styled-components';
import { EuiLink, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui';
-import { MonitorSummary } from '../../../../../common/graphql/types';
import { MostRecentError } from './most_recent_error';
import { MonitorStatusList } from './monitor_status_list';
-import { MonitorDetails } from '../../../../../common/runtime_types';
+import { MonitorDetails, MonitorSummary } from '../../../../../common/runtime_types';
import { MonitorListActionsPopover } from '../../../connected';
const ContainerDiv = styled.div`
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_list.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_list.tsx
index a2042e379dd80..8a46167dcd3bc 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_list.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_list.tsx
@@ -8,9 +8,9 @@ import React from 'react';
import { get, capitalize } from 'lodash';
import { EuiCallOut, EuiSpacer } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
-import { Check } from '../../../../../common/graphql/types';
import { LocationLink } from './location_link';
import { MonitorStatusRow } from './monitor_status_row';
+import { Check } from '../../../../../common/runtime_types';
import { STATUS, UNNAMED_LOCATION } from '../../../../../common/constants';
interface MonitorStatusListProps {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_status_column.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_status_column.tsx
index 7e23be572a6f9..8076fe66cc208 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_status_column.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_status_column.tsx
@@ -11,7 +11,7 @@ import { capitalize } from 'lodash';
import styled from 'styled-components';
import { EuiHealth, EuiFlexGroup, EuiFlexItem, EuiText, EuiToolTip } from '@elastic/eui';
import { parseTimestamp } from './parse_timestamp';
-import { Check } from '../../../../common/graphql/types';
+import { Check } from '../../../../common/runtime_types';
import {
STATUS,
SHORT_TIMESPAN_LOCALE,
diff --git a/x-pack/legacy/plugins/uptime/public/components/higher_order/index.ts b/x-pack/legacy/plugins/uptime/public/components/higher_order/index.ts
index e0e14456cfc68..0682f6d0478f3 100644
--- a/x-pack/legacy/plugins/uptime/public/components/higher_order/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/higher_order/index.ts
@@ -4,5 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
-export { UptimeGraphQLQueryProps, withUptimeGraphQL } from './uptime_graphql_query';
export { ResponsiveWrapperProps, withResponsiveWrapper } from './responsive_wrapper';
diff --git a/x-pack/legacy/plugins/uptime/public/components/higher_order/uptime_graphql_query.tsx b/x-pack/legacy/plugins/uptime/public/components/higher_order/uptime_graphql_query.tsx
deleted file mode 100644
index 6839050cec7a8..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/components/higher_order/uptime_graphql_query.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { OperationVariables } from 'apollo-client';
-import { GraphQLError } from 'graphql';
-import React, { Fragment, useContext, useEffect, useState } from 'react';
-import { withApollo, WithApolloClient } from 'react-apollo';
-import { formatUptimeGraphQLErrorList } from '../../lib/helper/format_error_list';
-import { UptimeRefreshContext } from '../../contexts';
-
-export interface UptimeGraphQLQueryProps {
- loading: boolean;
- data?: T;
- errors?: GraphQLError[];
-}
-
-interface UptimeGraphQLProps {
- implementsCustomErrorState?: boolean;
- variables: OperationVariables;
-}
-
-/**
- * This HOC abstracts the task of querying our GraphQL endpoint,
- * which eliminates the need for a lot of boilerplate code in the other components.
- *
- * @type T - the expected result's type
- * @type P - any props the wrapped component will require
- * @param WrappedComponent - the consuming component
- * @param query - the graphQL query
- */
-export function withUptimeGraphQL(WrappedComponent: any, query: any) {
- type Props = UptimeGraphQLProps & WithApolloClient & P;
-
- return withApollo((props: Props) => {
- const { lastRefresh } = useContext(UptimeRefreshContext);
- const [loading, setLoading] = useState(true);
- const [data, setData] = useState(undefined);
- const [errors, setErrors] = useState(undefined);
- let updateState = (
- loadingVal: boolean,
- dataVal: T | undefined,
- errorsVal: GraphQLError[] | undefined
- ) => {
- setLoading(loadingVal);
- setData(dataVal);
- setErrors(errorsVal);
- };
- const { client, implementsCustomErrorState, variables } = props;
- const fetch = () => {
- setLoading(true);
- client
- .query({ fetchPolicy: 'network-only', query, variables })
- .then(
- (result: any) => {
- updateState(result.loading, result.data, result.errors);
- },
- (result: any) => {
- updateState(false, undefined, result.graphQLErrors);
- }
- );
- };
- useEffect(() => {
- fetch();
-
- /**
- * If the `then` handler in `fetch`'s promise is fired after
- * this component has unmounted, it will try to set state on an
- * unmounted component, which indicates a memory leak and will trigger
- * React warnings.
- *
- * We counteract this side effect by providing a cleanup function that will
- * reassign the update function to do nothing with the returned values.
- */
- return () => {
- // this component is planned to be deprecated, for the time being
- // we will want to preserve this for the reason above.
- // eslint-disable-next-line react-hooks/exhaustive-deps
- updateState = () => {};
- };
- }, [variables, lastRefresh]);
- if (!implementsCustomErrorState && errors && errors.length > 0) {
- return {formatUptimeGraphQLErrorList(errors)};
- }
- return ;
- });
-}
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap
new file mode 100644
index 0000000000000..36bc9bb860211
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap
@@ -0,0 +1,69 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CertificateForm shallow renders expected elements for valid props 1`] = `
+
+
+
+`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap
new file mode 100644
index 0000000000000..93151198c0f49
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap
@@ -0,0 +1,69 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CertificateForm shallow renders expected elements for valid props 1`] = `
+
+
+
+`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx b/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx
new file mode 100644
index 0000000000000..a3158f3d72445
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { CertificateExpirationForm } from '../certificate_form';
+import { shallowWithRouter } from '../../../lib';
+
+describe('CertificateForm', () => {
+ it('shallow renders expected elements for valid props', () => {
+ expect(
+ shallowWithRouter(
+
+ )
+ ).toMatchSnapshot();
+ });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx b/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx
new file mode 100644
index 0000000000000..654d51019d4e5
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { IndicesForm } from '../indices_form';
+import { shallowWithRouter } from '../../../lib';
+
+describe('CertificateForm', () => {
+ it('shallow renders expected elements for valid props', () => {
+ expect(
+ shallowWithRouter(
+
+ )
+ ).toMatchSnapshot();
+ });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/certificate_form.tsx b/x-pack/legacy/plugins/uptime/public/components/settings/certificate_form.tsx
new file mode 100644
index 0000000000000..5103caee1e1c0
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/settings/certificate_form.tsx
@@ -0,0 +1,160 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { useSelector } from 'react-redux';
+import {
+ EuiDescribedFormGroup,
+ EuiFormRow,
+ EuiCode,
+ EuiFieldNumber,
+ EuiTitle,
+ EuiSpacer,
+ EuiSelect,
+ EuiFlexGroup,
+ EuiFlexItem,
+} from '@elastic/eui';
+import { defaultDynamicSettings, DynamicSettings } from '../../../common/runtime_types';
+import { selectDynamicSettings } from '../../state/selectors';
+
+type NumStr = string | number;
+
+export type OnFieldChangeType = (field: string, value?: NumStr) => void;
+
+export interface SettingsFormProps {
+ onChange: OnFieldChangeType;
+ formFields: DynamicSettings | null;
+ fieldErrors: any;
+ isDisabled: boolean;
+}
+
+export const CertificateExpirationForm: React.FC = ({
+ onChange,
+ formFields,
+ fieldErrors,
+ isDisabled,
+}) => {
+ const dss = useSelector(selectDynamicSettings);
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+ }
+ description={
+
+ }
+ >
+ {defaultDynamicSettings?.certificatesThresholds?.errorState}
+ ),
+ }}
+ />
+ }
+ isInvalid={!!fieldErrors?.certificatesThresholds?.errorState}
+ label={
+
+ }
+ >
+
+
+
+ onChange(
+ 'certificatesThresholds.errorState',
+ value === '' ? undefined : Number(value)
+ )
+ }
+ />
+
+
+
+
+
+
+ {defaultDynamicSettings?.certificatesThresholds?.warningState}
+ ),
+ }}
+ />
+ }
+ isInvalid={!!fieldErrors?.certificatesThresholds?.warningState}
+ label={
+
+ }
+ >
+
+
+
+ onChange('certificatesThresholds.warningState', Number(event.currentTarget.value))
+ }
+ />
+
+
+
+
+
+
+
+
+ );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/indices_form.tsx b/x-pack/legacy/plugins/uptime/public/components/settings/indices_form.tsx
new file mode 100644
index 0000000000000..c28eca2ea229e
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/settings/indices_form.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { useSelector } from 'react-redux';
+import {
+ EuiDescribedFormGroup,
+ EuiFormRow,
+ EuiCode,
+ EuiFieldText,
+ EuiTitle,
+ EuiSpacer,
+} from '@elastic/eui';
+import { defaultDynamicSettings } from '../../../common/runtime_types';
+import { selectDynamicSettings } from '../../state/selectors';
+import { SettingsFormProps } from './certificate_form';
+
+export const IndicesForm: React.FC = ({
+ onChange,
+ formFields,
+ fieldErrors,
+ isDisabled,
+}) => {
+ const dss = useSelector(selectDynamicSettings);
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+ }
+ description={
+
+ }
+ >
+ {defaultDynamicSettings.heartbeatIndices},
+ }}
+ />
+ }
+ isInvalid={!!fieldErrors?.heartbeatIndices}
+ label={
+
+ }
+ >
+ onChange('heartbeatIndices', event.currentTarget.value)}
+ />
+
+
+
+ );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/apollo_client_adapter.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/apollo_client_adapter.ts
deleted file mode 100644
index 2cec0d5fc8c64..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/apollo_client_adapter.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { InMemoryCache } from 'apollo-cache-inmemory';
-import { ApolloClient } from 'apollo-client';
-import { HttpLink } from 'apollo-link-http';
-import { CreateGraphQLClient } from './framework_adapter_types';
-
-export const createApolloClient: CreateGraphQLClient = (uri: string, xsrfHeader: string) =>
- new ApolloClient({
- link: new HttpLink({ uri, credentials: 'same-origin', headers: { 'kbn-xsrf': xsrfHeader } }),
- cache: new InMemoryCache({ dataIdFromObject: () => undefined }),
- });
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/framework_adapter_types.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/framework_adapter_types.ts
deleted file mode 100644
index 34cf48514c932..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/framework_adapter_types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { NormalizedCacheObject } from 'apollo-cache-inmemory';
-import { ApolloClient } from 'apollo-client';
-
-export type GraphQLClient = ApolloClient;
-
-export type CreateGraphQLClient = (url: string, xsrfHeader: string) => GraphQLClient;
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx b/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
index a2f3328b98612..71c73bf5ba5d4 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
+++ b/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
@@ -20,7 +20,6 @@ import {
DEFAULT_TIMEPICKER_QUICK_RANGES,
} from '../../../../common/constants';
import { UMFrameworkAdapter } from '../../lib';
-import { createApolloClient } from './apollo_client_adapter';
export const getKibanaFrameworkAdapter = (
core: CoreStart,
@@ -60,7 +59,6 @@ export const getKibanaFrameworkAdapter = (
const props: UptimeAppProps = {
basePath: basePath.get(),
canSave,
- client: createApolloClient(`${basePath.get()}/api/uptime/graphql`, 'true'),
core,
darkMode: core.uiSettings.get(DEFAULT_DARK_MODE),
commonlyUsedRanges: core.uiSettings.get(DEFAULT_TIMEPICKER_QUICK_RANGES),
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/__snapshots__/format_error_string.test.ts.snap b/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/__snapshots__/format_error_string.test.ts.snap
deleted file mode 100644
index 8519157e4039e..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/__snapshots__/format_error_string.test.ts.snap
+++ /dev/null
@@ -1,7 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`formatErrorString returns a formatted string containing each error 1`] = `
-"Error: foo is bar
-Error: bar is not foo
-"
-`;
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/format_error_string.test.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/format_error_string.test.ts
deleted file mode 100644
index ba437c05cbe2b..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/format_error_string.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { formatUptimeGraphQLErrorList } from '../format_error_list';
-
-describe('formatErrorString', () => {
- it('returns an empty string for empty array', () => {
- const result = formatUptimeGraphQLErrorList([]);
- expect(result).toEqual('');
- });
- it('returns a formatted string containing each error', () => {
- const result = formatUptimeGraphQLErrorList([
- {
- message: 'foo is bar',
- locations: undefined,
- path: undefined,
- nodes: undefined,
- source: undefined,
- positions: undefined,
- originalError: undefined,
- extensions: undefined,
- name: 'test error',
- },
- {
- message: 'bar is not foo',
- locations: undefined,
- path: undefined,
- nodes: undefined,
- source: undefined,
- positions: undefined,
- originalError: undefined,
- extensions: undefined,
- name: 'test error',
- },
- ]);
- expect(result).toMatchSnapshot();
- });
-});
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/format_error_list.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/format_error_list.ts
deleted file mode 100644
index a23122c5eead5..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/format_error_list.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-import { GraphQLError } from 'graphql';
-
-export const formatUptimeGraphQLErrorList = (errors: GraphQLError[]) =>
- errors.reduce(
- (errorString, error) =>
- errorString.concat(
- `${i18n.translate('xpack.uptime.errorMessage', {
- values: { message: error.message },
- defaultMessage: 'Error: {message}',
- })}\n`
- ),
- ''
- );
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/__snapshots__/get_apm_href.test.ts.snap b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/__snapshots__/get_apm_href.test.ts.snap
deleted file mode 100644
index 53d336b52bd24..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/__snapshots__/get_apm_href.test.ts.snap
+++ /dev/null
@@ -1,5 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`getApmHref creates href with base path when present 1`] = `"foo/app/apm#/services?kuery=url.domain:%20%22www.elastic.co%22&rangeFrom=now-15m&rangeTo=now"`;
-
-exports[`getApmHref does not add a base path or extra slash when base path is empty string 1`] = `"/app/apm#/services?kuery=url.domain:%20%22www.elastic.co%22&rangeFrom=now-15m&rangeTo=now"`;
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/__snapshots__/get_infra_href.test.ts.snap b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/__snapshots__/get_infra_href.test.ts.snap
deleted file mode 100644
index e79eb50d384a8..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/__snapshots__/get_infra_href.test.ts.snap
+++ /dev/null
@@ -1,19 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`getInfraHref getInfraContainerHref creates a link for valid parameters 1`] = `"foo/app/metrics/link-to/container-detail/test-container-id"`;
-
-exports[`getInfraHref getInfraContainerHref does not specify a base path when none is available 1`] = `"/app/metrics/link-to/container-detail/test-container-id"`;
-
-exports[`getInfraHref getInfraContainerHref returns the first item when multiple container ids are supplied 1`] = `"bar/app/metrics/link-to/container-detail/test-container-id"`;
-
-exports[`getInfraHref getInfraIpHref creates a link for valid parameters 1`] = `"bar/app/metrics/inventory?waffleFilter=(expression:'host.ip%20%3A%20151.101.202.217',kind:kuery)"`;
-
-exports[`getInfraHref getInfraIpHref does not specify a base path when none is available 1`] = `"/app/metrics/inventory?waffleFilter=(expression:'host.ip%20%3A%20151.101.202.217',kind:kuery)"`;
-
-exports[`getInfraHref getInfraIpHref returns a url for ors between multiple ips 1`] = `"foo/app/metrics/inventory?waffleFilter=(expression:'host.ip%20%3A%20152.151.23.192%20or%20host.ip%20%3A%20151.101.202.217',kind:kuery)"`;
-
-exports[`getInfraHref getInfraKubernetesHref creates a link for valid parameters 1`] = `"foo/app/metrics/link-to/pod-detail/test-pod-uid"`;
-
-exports[`getInfraHref getInfraKubernetesHref does not specify a base path when none is available 1`] = `"/app/metrics/link-to/pod-detail/test-pod-uid"`;
-
-exports[`getInfraHref getInfraKubernetesHref selects the first pod uid when there are multiple 1`] = `"/app/metrics/link-to/pod-detail/test-pod-uid"`;
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/__snapshots__/get_logging_href.test.ts.snap b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/__snapshots__/get_logging_href.test.ts.snap
deleted file mode 100644
index cfac6ce133c8a..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/__snapshots__/get_logging_href.test.ts.snap
+++ /dev/null
@@ -1,13 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`getLoggingHref creates a container href with base path when present 1`] = `"bar/app/logs?logFilter=(expression:'container.id%20:%20test-container-id',kind:kuery)"`;
-
-exports[`getLoggingHref creates a container href without a base path if it's an empty string 1`] = `"/app/logs?logFilter=(expression:'container.id%20:%20test-container-id',kind:kuery)"`;
-
-exports[`getLoggingHref creates a pod href with base path when present 1`] = `"bar/app/logs?logFilter=(expression:'pod.uid%20:%20test-pod-id',kind:kuery)"`;
-
-exports[`getLoggingHref creates a pod href without a base path when it's an empty string 1`] = `"/app/logs?logFilter=(expression:'pod.uid%20:%20test-pod-id',kind:kuery)"`;
-
-exports[`getLoggingHref creates an ip href with base path when present 1`] = `"bar/app/logs?logFilter=(expression:'pod.uid%20:%20test-pod-id',kind:kuery)"`;
-
-exports[`getLoggingHref creates an ip href without a base path when it's an empty string 1`] = `"/app/logs?logFilter=(expression:'host.ip%20%3A%20151.101.202.217',kind:kuery)"`;
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_apm_href.test.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_apm_href.test.ts
index db49e95896ac1..f27ed78d593ac 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_apm_href.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_apm_href.test.ts
@@ -5,7 +5,7 @@
*/
import { getApmHref } from '../get_apm_href';
-import { MonitorSummary } from '../../../../../common/graphql/types';
+import { MonitorSummary } from '../../../../../common/runtime_types';
describe('getApmHref', () => {
let summary: MonitorSummary;
@@ -29,7 +29,7 @@ describe('getApmHref', () => {
uid: 'test-pod-id',
},
},
- timestamp: '123',
+ timestamp: 123,
},
],
timestamp: '123',
@@ -43,11 +43,15 @@ describe('getApmHref', () => {
it('creates href with base path when present', () => {
const result = getApmHref(summary, 'foo', 'now-15m', 'now');
- expect(result).toMatchSnapshot();
+ expect(result).toMatchInlineSnapshot(
+ `"foo/app/apm#/services?kuery=url.domain:%20%22www.elastic.co%22&rangeFrom=now-15m&rangeTo=now"`
+ );
});
it('does not add a base path or extra slash when base path is empty string', () => {
const result = getApmHref(summary, '', 'now-15m', 'now');
- expect(result).toMatchSnapshot();
+ expect(result).toMatchInlineSnapshot(
+ `"/app/apm#/services?kuery=url.domain:%20%22www.elastic.co%22&rangeFrom=now-15m&rangeTo=now"`
+ );
});
});
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_infra_href.test.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_infra_href.test.ts
index c2360c321da8f..ee5db74af22c2 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_infra_href.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_infra_href.test.ts
@@ -5,7 +5,7 @@
*/
import { getInfraContainerHref, getInfraKubernetesHref, getInfraIpHref } from '../get_infra_href';
-import { MonitorSummary } from '../../../../../common/graphql/types';
+import { MonitorSummary } from '../../../../../common/runtime_types';
describe('getInfraHref', () => {
let summary: MonitorSummary;
@@ -13,7 +13,6 @@ describe('getInfraHref', () => {
summary = {
monitor_id: 'foo',
state: {
- summary: {},
checks: [
{
monitor: {
@@ -28,9 +27,11 @@ describe('getInfraHref', () => {
uid: 'test-pod-uid',
},
},
- timestamp: '123',
+ timestamp: 123,
},
],
+ summary: {},
+ url: {},
timestamp: '123',
},
};
@@ -38,11 +39,15 @@ describe('getInfraHref', () => {
it('getInfraContainerHref creates a link for valid parameters', () => {
const result = getInfraContainerHref(summary, 'foo');
- expect(result).toMatchSnapshot();
+ expect(result).toMatchInlineSnapshot(
+ `"foo/app/metrics/link-to/container-detail/test-container-id"`
+ );
});
it('getInfraContainerHref does not specify a base path when none is available', () => {
- expect(getInfraContainerHref(summary, '')).toMatchSnapshot();
+ expect(getInfraContainerHref(summary, '')).toMatchInlineSnapshot(
+ `"/app/metrics/link-to/container-detail/test-container-id"`
+ );
});
it('getInfraContainerHref returns undefined when no container id is present', () => {
@@ -65,7 +70,7 @@ describe('getInfraHref', () => {
uid: 'test-pod-uid',
},
},
- timestamp: '123',
+ timestamp: 123,
},
{
monitor: {
@@ -80,10 +85,12 @@ describe('getInfraHref', () => {
uid: 'test-pod-uid-bar',
},
},
- timestamp: '123',
+ timestamp: 123,
},
];
- expect(getInfraContainerHref(summary, 'bar')).toMatchSnapshot();
+ expect(getInfraContainerHref(summary, 'bar')).toMatchInlineSnapshot(
+ `"bar/app/metrics/link-to/container-detail/test-container-id"`
+ );
});
it('getInfraContainerHref returns undefined when checks are undefined', () => {
@@ -94,11 +101,13 @@ describe('getInfraHref', () => {
it('getInfraKubernetesHref creates a link for valid parameters', () => {
const result = getInfraKubernetesHref(summary, 'foo');
expect(result).not.toBeUndefined();
- expect(result).toMatchSnapshot();
+ expect(result).toMatchInlineSnapshot(`"foo/app/metrics/link-to/pod-detail/test-pod-uid"`);
});
it('getInfraKubernetesHref does not specify a base path when none is available', () => {
- expect(getInfraKubernetesHref(summary, '')).toMatchSnapshot();
+ expect(getInfraKubernetesHref(summary, '')).toMatchInlineSnapshot(
+ `"/app/metrics/link-to/pod-detail/test-pod-uid"`
+ );
});
it('getInfraKubernetesHref returns undefined when no pod data is present', () => {
@@ -121,7 +130,7 @@ describe('getInfraHref', () => {
uid: 'test-pod-uid',
},
},
- timestamp: '123',
+ timestamp: 123,
},
{
monitor: {
@@ -136,10 +145,12 @@ describe('getInfraHref', () => {
uid: 'test-pod-uid-bar',
},
},
- timestamp: '123',
+ timestamp: 123,
},
];
- expect(getInfraKubernetesHref(summary, '')).toMatchSnapshot();
+ expect(getInfraKubernetesHref(summary, '')).toMatchInlineSnapshot(
+ `"/app/metrics/link-to/pod-detail/test-pod-uid"`
+ );
});
it('getInfraKubernetesHref returns undefined when checks are undefined', () => {
@@ -148,17 +159,21 @@ describe('getInfraHref', () => {
});
it('getInfraKubernetesHref returns undefined when checks are null', () => {
- summary.state.checks![0]!.kubernetes!.pod!.uid = null;
+ delete summary.state.checks![0]!.kubernetes!.pod!.uid;
expect(getInfraKubernetesHref(summary, '')).toBeUndefined();
});
it('getInfraIpHref creates a link for valid parameters', () => {
const result = getInfraIpHref(summary, 'bar');
- expect(result).toMatchSnapshot();
+ expect(result).toMatchInlineSnapshot(
+ `"bar/app/metrics/inventory?waffleFilter=(expression:'host.ip%20%3A%20151.101.202.217',kind:kuery)"`
+ );
});
it('getInfraIpHref does not specify a base path when none is available', () => {
- expect(getInfraIpHref(summary, '')).toMatchSnapshot();
+ expect(getInfraIpHref(summary, '')).toMatchInlineSnapshot(
+ `"/app/metrics/inventory?waffleFilter=(expression:'host.ip%20%3A%20151.101.202.217',kind:kuery)"`
+ );
});
it('getInfraIpHref returns undefined when ip is undefined', () => {
@@ -167,14 +182,14 @@ describe('getInfraHref', () => {
});
it('getInfraIpHref returns undefined when ip is null', () => {
- summary.state.checks![0].monitor.ip = null;
+ delete summary.state.checks![0].monitor.ip;
expect(getInfraIpHref(summary, 'foo')).toBeUndefined();
});
it('getInfraIpHref returns a url for ors between multiple ips', () => {
summary.state.checks = [
{
- timestamp: '123',
+ timestamp: 123,
monitor: {
ip: '152.151.23.192',
status: 'up',
@@ -193,10 +208,12 @@ describe('getInfraHref', () => {
uid: 'test-pod-uid',
},
},
- timestamp: '123',
+ timestamp: 123,
},
];
- expect(getInfraIpHref(summary, 'foo')).toMatchSnapshot();
+ expect(getInfraIpHref(summary, 'foo')).toMatchInlineSnapshot(
+ `"foo/app/metrics/inventory?waffleFilter=(expression:'host.ip%20%3A%20152.151.23.192%20or%20host.ip%20%3A%20151.101.202.217',kind:kuery)"`
+ );
});
it('getInfraIpHref returns undefined if checks are undefined', () => {
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_logging_href.test.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_logging_href.test.ts
index 1117fa1429962..b188a8d1b8ef6 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_logging_href.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_logging_href.test.ts
@@ -9,7 +9,7 @@ import {
getLoggingKubernetesHref,
getLoggingIpHref,
} from '../get_logging_href';
-import { MonitorSummary } from '../../../../../common/graphql/types';
+import { MonitorSummary } from '../../../../../common/runtime_types';
describe('getLoggingHref', () => {
let summary: MonitorSummary;
@@ -33,10 +33,11 @@ describe('getLoggingHref', () => {
uid: 'test-pod-id',
},
},
- timestamp: '123',
+ timestamp: 123,
},
],
timestamp: '123',
+ url: {},
},
};
});
@@ -44,37 +45,49 @@ describe('getLoggingHref', () => {
it('creates a container href with base path when present', () => {
const result = getLoggingContainerHref(summary, 'bar');
expect(result).not.toBeUndefined();
- expect(result).toMatchSnapshot();
+ expect(result).toMatchInlineSnapshot(
+ `"bar/app/logs?logFilter=(expression:'container.id%20:%20test-container-id',kind:kuery)"`
+ );
});
it(`creates a container href without a base path if it's an empty string`, () => {
const result = getLoggingContainerHref(summary, '');
expect(result).not.toBeUndefined();
- expect(result).toMatchSnapshot();
+ expect(result).toMatchInlineSnapshot(
+ `"/app/logs?logFilter=(expression:'container.id%20:%20test-container-id',kind:kuery)"`
+ );
});
it(`creates an ip href with base path when present`, () => {
const result = getLoggingKubernetesHref(summary, 'bar');
expect(result).not.toBeUndefined();
- expect(result).toMatchSnapshot();
+ expect(result).toMatchInlineSnapshot(
+ `"bar/app/logs?logFilter=(expression:'pod.uid%20:%20test-pod-id',kind:kuery)"`
+ );
});
it('creates a pod href with base path when present', () => {
const result = getLoggingKubernetesHref(summary, 'bar');
expect(result).not.toBeUndefined();
- expect(result).toMatchSnapshot();
+ expect(result).toMatchInlineSnapshot(
+ `"bar/app/logs?logFilter=(expression:'pod.uid%20:%20test-pod-id',kind:kuery)"`
+ );
});
it(`creates a pod href without a base path when it's an empty string`, () => {
const result = getLoggingKubernetesHref(summary, '');
expect(result).not.toBeUndefined();
- expect(result).toMatchSnapshot();
+ expect(result).toMatchInlineSnapshot(
+ `"/app/logs?logFilter=(expression:'pod.uid%20:%20test-pod-id',kind:kuery)"`
+ );
});
it(`creates an ip href without a base path when it's an empty string`, () => {
const result = getLoggingIpHref(summary, '');
expect(result).not.toBeUndefined();
- expect(result).toMatchSnapshot();
+ expect(result).toMatchInlineSnapshot(
+ `"/app/logs?logFilter=(expression:'host.ip%20%3A%20151.101.202.217',kind:kuery)"`
+ );
});
it('returns undefined if necessary container is not present', () => {
@@ -83,7 +96,7 @@ describe('getLoggingHref', () => {
});
it('returns undefined if necessary container is null', () => {
- summary.state.checks![0].container!.id = null;
+ delete summary.state.checks![0].container!.id;
expect(getLoggingContainerHref(summary, '')).toBeUndefined();
});
@@ -93,7 +106,7 @@ describe('getLoggingHref', () => {
});
it('returns undefined if necessary pod is null', () => {
- summary.state.checks![0].kubernetes!.pod!.uid = null;
+ delete summary.state.checks![0].kubernetes!.pod!.uid;
expect(getLoggingKubernetesHref(summary, '')).toBeUndefined();
});
@@ -103,7 +116,7 @@ describe('getLoggingHref', () => {
});
it('returns undefined ip href if ip is null', () => {
- summary.state.checks![0].monitor.ip = null;
+ delete summary.state.checks![0].monitor.ip;
expect(getLoggingIpHref(summary, '')).toBeUndefined();
});
});
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/build_href.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/build_href.ts
index 19e437651090b..0f830435be89d 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/build_href.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/build_href.ts
@@ -5,7 +5,7 @@
*/
import { get } from 'lodash';
-import { Check } from '../../../../common/graphql/types';
+import { Check } from '../../../../common/runtime_types';
/**
* Builds URLs to the designated features by extracting values from the provided
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.ts
index aaa57acee6c6a..0ff5a8acb3367 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.ts
@@ -6,7 +6,7 @@
import { get } from 'lodash';
import { addBasePath } from './add_base_path';
-import { MonitorSummary } from '../../../../common/graphql/types';
+import { MonitorSummary } from '../../../../common/runtime_types';
export const getApmHref = (
summary: MonitorSummary,
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_infra_href.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_infra_href.ts
index 73065be395c76..384067e4b033b 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_infra_href.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_infra_href.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { MonitorSummary } from '../../../../common/graphql/types';
+import { MonitorSummary } from '../../../../common/runtime_types';
import { addBasePath } from './add_base_path';
import { buildHref } from './build_href';
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_logging_href.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_logging_href.ts
index b97b5a34855fb..222c7b57c9272 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_logging_href.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_logging_href.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { MonitorSummary } from '../../../../common/graphql/types';
+import { MonitorSummary } from '../../../../common/runtime_types';
import { addBasePath } from './add_base_path';
import { buildHref } from './build_href';
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/series_has_down_values.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/series_has_down_values.ts
index 13079b912a147..4ebeb350ed892 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/series_has_down_values.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/series_has_down_values.ts
@@ -4,8 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { SummaryHistogramPoint } from '../../../common/graphql/types';
+import { HistogramPoint } from '../../../common/runtime_types';
-export const seriesHasDownValues = (series: SummaryHistogramPoint[] | null): boolean => {
+export const seriesHasDownValues = (series: HistogramPoint[] | null): boolean => {
return series ? series.some(point => !!point.down) : false;
};
diff --git a/x-pack/legacy/plugins/uptime/public/lib/lib.ts b/x-pack/legacy/plugins/uptime/public/lib/lib.ts
index aba151bf5aab3..6b6191441c931 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/lib.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/lib.ts
@@ -4,9 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { NormalizedCacheObject } from 'apollo-cache-inmemory';
-import ApolloClient from 'apollo-client';
-import React from 'react';
+import { ReactElement } from 'react';
import { ChromeBreadcrumb } from 'src/core/public';
import { UMBadge } from '../badge';
import { UptimeAppProps } from '../uptime_app';
@@ -19,9 +17,7 @@ export type UMUpdateBreadcrumbs = (breadcrumbs: ChromeBreadcrumb[]) => void;
export type UMUpdateBadge = (badge: UMBadge) => void;
-export type UMGraphQLClient = ApolloClient; // | OtherClientType
-
-export type BootstrapUptimeApp = (props: UptimeAppProps) => React.ReactElement;
+export type BootstrapUptimeApp = (props: UptimeAppProps) => ReactElement;
export interface UMFrameworkAdapter {
render(element: any): void;
diff --git a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
index 5550facaf42e9..5b51a208a4c37 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
@@ -5,20 +5,15 @@
*/
import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
import styled from 'styled-components';
import { i18n } from '@kbn/i18n';
-import {
- MonitorList,
- OverviewPageParsingErrorCallout,
- StatusPanel,
-} from '../components/functional';
+import { OverviewPageParsingErrorCallout, StatusPanel } from '../components/functional';
import { useUptimeTelemetry, UptimePage, useGetUrlParams } from '../hooks';
import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
import { useTrackPageview } from '../../../../../plugins/observability/public';
import { DataPublicPluginSetup, IIndexPattern } from '../../../../../../src/plugins/data/public';
-import { UptimeThemeContext } from '../contexts';
-import { EmptyState, FilterGroup, KueryBar } from '../components/connected';
+import { EmptyState, FilterGroup, KueryBar, MonitorList } from '../components/connected';
import { useUpdateKueryString } from '../hooks';
import { PageHeader } from './page_header';
import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
@@ -40,34 +35,9 @@ const EuiFlexItemStyled = styled(EuiFlexItem)`
}
`;
-// TODO: these values belong deeper down in the monitor
-// list pagination control, but are here temporarily until we
-// are done removing GraphQL
-const DEFAULT_PAGE_SIZE = 10;
-const LOCAL_STORAGE_KEY = 'xpack.uptime.monitorList.pageSize';
-const getMonitorListPageSizeValue = () => {
- const value = parseInt(localStorage.getItem(LOCAL_STORAGE_KEY) ?? '', 10);
- if (isNaN(value)) {
- return DEFAULT_PAGE_SIZE;
- }
- return value;
-};
-
export const OverviewPageComponent = ({ autocomplete, indexPattern, setEsKueryFilters }: Props) => {
- const { colors } = useContext(UptimeThemeContext);
- // TODO: this is temporary until we migrate the monitor list to our Redux implementation
- const [monitorListPageSize, setMonitorListPageSize] = useState(
- getMonitorListPageSizeValue()
- );
const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = useGetUrlParams();
- const {
- dateRangeStart,
- dateRangeEnd,
- pagination,
- statusFilter,
- search,
- filters: urlFilters,
- } = params;
+ const { search, filters: urlFilters } = params;
useUptimeTelemetry(UptimePage.Overview);
@@ -80,13 +50,6 @@ export const OverviewPageComponent = ({ autocomplete, indexPattern, setEsKueryFi
setEsKueryFilters(esFilters ?? '');
}, [esFilters, setEsKueryFilters]);
- const sharedProps = {
- dateRangeStart,
- dateRangeEnd,
- statusFilter,
- filters: esFilters,
- };
-
const linkParameters = stringifyUrlParams(params, true);
const heading = i18n.translate('xpack.uptime.overviewPage.headerText', {
@@ -117,20 +80,7 @@ export const OverviewPageComponent = ({ autocomplete, indexPattern, setEsKueryFi
-
+
);
diff --git a/x-pack/legacy/plugins/uptime/public/pages/settings.tsx b/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
index 765b0e3c664bc..049dffecd3f2e 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
@@ -9,46 +9,54 @@ import {
EuiButton,
EuiButtonEmpty,
EuiCallOut,
- EuiCode,
- EuiDescribedFormGroup,
- EuiFieldText,
EuiFlexGroup,
EuiFlexItem,
EuiForm,
- EuiFormRow,
EuiPanel,
EuiSpacer,
- EuiTitle,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
-import { connect } from 'react-redux';
-import { isEqual } from 'lodash';
+import { useDispatch, useSelector } from 'react-redux';
+import { cloneDeep, isEqual, set } from 'lodash';
import { i18n } from '@kbn/i18n';
import { Link } from 'react-router-dom';
-import { AppState } from '../state';
import { selectDynamicSettings } from '../state/selectors';
-import { DynamicSettingsState } from '../state/reducers/dynamic_settings';
import { getDynamicSettings, setDynamicSettings } from '../state/actions/dynamic_settings';
-import { defaultDynamicSettings, DynamicSettings } from '../../common/runtime_types';
+import { DynamicSettings } from '../../common/runtime_types';
import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
import { OVERVIEW_ROUTE } from '../../common/constants';
import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
import { UptimePage, useUptimeTelemetry } from '../hooks';
+import { IndicesForm } from '../components/settings/indices_form';
+import {
+ CertificateExpirationForm,
+ OnFieldChangeType,
+} from '../components/settings/certificate_form';
+
+const getFieldErrors = (formFields: DynamicSettings | null) => {
+ if (formFields) {
+ const blankStr = 'May not be blank';
+ const { certificatesThresholds, heartbeatIndices } = formFields;
+ const heartbeatIndErr = heartbeatIndices.match(/^\S+$/) ? '' : blankStr;
+ const errorStateErr = certificatesThresholds?.errorState ? null : blankStr;
+ const warningStateErr = certificatesThresholds?.warningState ? null : blankStr;
+ return {
+ heartbeatIndices: heartbeatIndErr,
+ certificatesThresholds:
+ errorStateErr || warningStateErr
+ ? {
+ errorState: errorStateErr,
+ warningState: warningStateErr,
+ }
+ : null,
+ };
+ }
+ return null;
+};
-interface Props {
- dynamicSettingsState: DynamicSettingsState;
-}
-
-interface DispatchProps {
- dispatchGetDynamicSettings: typeof getDynamicSettings;
- dispatchSetDynamicSettings: typeof setDynamicSettings;
-}
+export const SettingsPage = () => {
+ const dss = useSelector(selectDynamicSettings);
-export const SettingsPageComponent = ({
- dynamicSettingsState: dss,
- dispatchGetDynamicSettings,
- dispatchSetDynamicSettings,
-}: Props & DispatchProps) => {
const settingsBreadcrumbText = i18n.translate('xpack.uptime.settingsBreadcrumbText', {
defaultMessage: 'Settings',
});
@@ -56,9 +64,11 @@ export const SettingsPageComponent = ({
useUptimeTelemetry(UptimePage.Settings);
+ const dispatch = useDispatch();
+
useEffect(() => {
- dispatchGetDynamicSettings({});
- }, [dispatchGetDynamicSettings]);
+ dispatch(getDynamicSettings({}));
+ }, [dispatch]);
const [formFields, setFormFields] = useState(dss.settings || null);
@@ -66,22 +76,22 @@ export const SettingsPageComponent = ({
setFormFields({ ...dss.settings });
}
- const fieldErrors = formFields && {
- heartbeatIndices: formFields.heartbeatIndices.match(/^\S+$/) ? null : 'May not be blank',
- };
+ const fieldErrors = getFieldErrors(formFields);
+
const isFormValid = !(fieldErrors && Object.values(fieldErrors).find(v => !!v));
- const onChangeFormField = (field: keyof DynamicSettings, value: any) => {
+ const onChangeFormField: OnFieldChangeType = (field, value) => {
if (formFields) {
- formFields[field] = value;
- setFormFields({ ...formFields });
+ const newFormFields = cloneDeep(formFields);
+ set(newFormFields, field, value);
+ setFormFields(cloneDeep(newFormFields));
}
};
const onApply = (event: React.FormEvent) => {
event.preventDefault();
if (formFields) {
- dispatchSetDynamicSettings(formFields);
+ dispatch(setDynamicSettings(formFields));
}
};
@@ -128,68 +138,18 @@ export const SettingsPageComponent = ({