From 635d035a04d27e0495198cbc4dce5f0134e71ec8 Mon Sep 17 00:00:00 2001 From: Candace Park Date: Tue, 2 Jun 2020 17:09:45 -0400 Subject: [PATCH] pauls comments --- .../ingest_manager/common/types/models/datasource.ts | 3 --- x-pack/plugins/ingest_manager/public/index.ts | 5 ++++- x-pack/plugins/siem/public/index.ts | 4 ---- .../ingest_manager_integration/configure_datasource.tsx | 9 ++++++++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/x-pack/plugins/ingest_manager/common/types/models/datasource.ts b/x-pack/plugins/ingest_manager/common/types/models/datasource.ts index fb2e6ec6dfe0bb..42ce69a5707cb1 100644 --- a/x-pack/plugins/ingest_manager/common/types/models/datasource.ts +++ b/x-pack/plugins/ingest_manager/common/types/models/datasource.ts @@ -43,9 +43,6 @@ export interface DatasourceInput extends Omit { streams: DatasourceInputStream[]; } -/** - * Type of `datasource` prop in CustomConfigureDatasourceContent - */ export interface NewDatasource { name: string; description?: string; diff --git a/x-pack/plugins/ingest_manager/public/index.ts b/x-pack/plugins/ingest_manager/public/index.ts index 10a7eff30fae46..ff923bc9043c9a 100644 --- a/x-pack/plugins/ingest_manager/public/index.ts +++ b/x-pack/plugins/ingest_manager/public/index.ts @@ -12,6 +12,9 @@ export const plugin = (initializerContext: PluginInitializerContext) => { return new IngestManagerPlugin(initializerContext); }; -export { CustomConfigureDatasourceContent } from './applications/ingest_manager/sections/agent_config/create_datasource_page/components/custom_configure_datasource'; +export { + CustomConfigureDatasourceContent, + CustomConfigureDatasourceProps, +} from './applications/ingest_manager/sections/agent_config/create_datasource_page/components/custom_configure_datasource'; export { NewDatasource } from './applications/ingest_manager/types'; diff --git a/x-pack/plugins/siem/public/index.ts b/x-pack/plugins/siem/public/index.ts index 718791938b5ee1..9e31ba8d771f7a 100644 --- a/x-pack/plugins/siem/public/index.ts +++ b/x-pack/plugins/siem/public/index.ts @@ -12,8 +12,4 @@ export const plugin = (context: PluginInitializerContext): Plugin => new Plugin( export { Plugin, PluginSetup, PluginStart }; -/** - * Exports Endpoint-specific datasource configuration instructions - * for use in the Ingest app create / edit datasource config - */ export { ConfigureEndpointDatasource } from './management/pages/policy/view/ingest_manager_integration/configure_datasource'; diff --git a/x-pack/plugins/siem/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx b/x-pack/plugins/siem/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx index 293ee112a42b4e..bbdeb21254536f 100644 --- a/x-pack/plugins/siem/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx +++ b/x-pack/plugins/siem/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx @@ -11,6 +11,7 @@ import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/p import { LinkToApp } from '../../../../../common/components/endpoint/link_to_app'; import { CustomConfigureDatasourceContent, + CustomConfigureDatasourceProps, NewDatasource, } from '../../../../../../../ingest_manager/public'; import { getManagementUrl } from '../../../..'; @@ -22,7 +23,13 @@ type DatasourceWithId = NewDatasource & { id: string }; * for use in the Ingest app create / edit datasource config */ export const ConfigureEndpointDatasource = memo( - ({ from, datasource }: { from: string; datasource: NewDatasource | DatasourceWithId }) => { + ({ + from, + datasource, + }: { + from: string; + datasource: CustomConfigureDatasourceProps['datasource']; + }) => { const { services } = useKibana(); let policyUrl = ''; if (from === 'edit') {