[asset manager] move collectors outside of implicit collection dir (e…

…lastic#162054) ## Summary Moving asset collectors up a level since they can also be used without periodic implicit collection wrapper
klacabane · Jul 19, 2023 · 77a9c6a · 77a9c6a
1 parent d965cd5
commit 77a9c6a
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/x-pack/plugins/asset_manager/server/lib/accessors/hosts/get_hosts_by_signals.ts b/x-pack/plugins/asset_manager/server/lib/accessors/hosts/get_hosts_by_signals.ts
@@ -7,7 +7,7 @@
 
 import { Asset } from '../../../../common/types_api';
 import { GetHostsOptionsInjected } from '.';
-import { collectHosts } from '../../implicit_collection/collectors/hosts';
+import { collectHosts } from '../../collectors/hosts';
 
 export async function getHostsBySignals(
   options: GetHostsOptionsInjected

diff --git a/...licit_collection/collectors/containers.ts → ...nager/server/lib/collectors/containers.ts b/...licit_collection/collectors/containers.ts → ...nager/server/lib/collectors/containers.ts
@@ -6,7 +6,7 @@
  */
 
 import { estypes } from '@elastic/elasticsearch';
-import { Asset } from '../../../../common/types_api';
+import { Asset } from '../../../common/types_api';
 import { CollectorOptions, QUERY_MAX_SIZE } from '.';
 import { withSpan } from './helpers';
 

diff --git a/...implicit_collection/collectors/helpers.ts → ..._manager/server/lib/collectors/helpers.ts b/...implicit_collection/collectors/helpers.ts → ..._manager/server/lib/collectors/helpers.ts
diff --git a/...b/implicit_collection/collectors/hosts.ts → ...et_manager/server/lib/collectors/hosts.ts b/...b/implicit_collection/collectors/hosts.ts → ...et_manager/server/lib/collectors/hosts.ts
@@ -6,7 +6,7 @@
  */
 
 import { estypes } from '@elastic/elasticsearch';
-import { Asset } from '../../../../common/types_api';
+import { Asset } from '../../../common/types_api';
 import { CollectorOptions, QUERY_MAX_SIZE } from '.';
 import { withSpan } from './helpers';
 

diff --git a/...b/implicit_collection/collectors/index.ts → ...et_manager/server/lib/collectors/index.ts b/...b/implicit_collection/collectors/index.ts → ...et_manager/server/lib/collectors/index.ts
@@ -8,8 +8,8 @@
 import { Transaction } from 'elastic-apm-node';
 import { estypes } from '@elastic/elasticsearch';
 import { ElasticsearchClient } from '@kbn/core/server';
-import { AssetManagerConfig } from '../../../types';
-import { Asset } from '../../../../common/types_api';
+import { AssetManagerConfig } from '../../types';
+import { Asset } from '../../../common/types_api';
 
 export const QUERY_MAX_SIZE = 10000;
 

diff --git a/...ib/implicit_collection/collectors/pods.ts → ...set_manager/server/lib/collectors/pods.ts b/...ib/implicit_collection/collectors/pods.ts → ...set_manager/server/lib/collectors/pods.ts
@@ -6,7 +6,7 @@
  */
 
 import { estypes } from '@elastic/elasticsearch';
-import { Asset } from '../../../../common/types_api';
+import { Asset } from '../../../common/types_api';
 import { CollectorOptions, QUERY_MAX_SIZE } from '.';
 import { withSpan } from './helpers';
 

diff --git a/...mplicit_collection/collectors/services.ts → ...manager/server/lib/collectors/services.ts b/...mplicit_collection/collectors/services.ts → ...manager/server/lib/collectors/services.ts
@@ -6,7 +6,7 @@
  */
 
 import { estypes } from '@elastic/elasticsearch';
-import { Asset } from '../../../../common/types_api';
+import { Asset } from '../../../common/types_api';
 import { CollectorOptions, QUERY_MAX_SIZE } from '.';
 import { withSpan } from './helpers';
 

diff --git a/x-pack/plugins/asset_manager/server/lib/implicit_collection/collector_runner.test.ts b/x-pack/plugins/asset_manager/server/lib/implicit_collection/collector_runner.test.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { CollectorRunner } from './collector_runner';
-import { CollectorOptions } from './collectors';
+import { CollectorOptions } from '../collectors';
 import { Asset } from '../../../common/types_api';
 import { INDEX_DEFAULTS } from '../../types';
 

diff --git a/x-pack/plugins/asset_manager/server/lib/implicit_collection/collector_runner.ts b/x-pack/plugins/asset_manager/server/lib/implicit_collection/collector_runner.ts
@@ -7,9 +7,9 @@
 
 import apm from 'elastic-apm-node';
 import { ImplicitCollectionOptions } from '.';
-import { Collector, CollectorOptions, QUERY_MAX_SIZE } from './collectors';
+import { Collector, CollectorOptions, QUERY_MAX_SIZE } from '../collectors';
 import { Asset } from '../../../common/types_api';
-import { withSpan } from './collectors/helpers';
+import { withSpan } from '../collectors/helpers';
 
 const TRANSACTION_TYPE = 'asset_manager-implicit_collection';
 const transactionName = (collectorName: string) => `asset_manager-collector_${collectorName}`;

diff --git a/x-pack/plugins/asset_manager/server/lib/implicit_collection/index.ts b/x-pack/plugins/asset_manager/server/lib/implicit_collection/index.ts
@@ -7,7 +7,7 @@
 import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { AssetManagerConfig } from '../../types';
 
-import { collectContainers, collectHosts, collectPods, collectServices } from './collectors';
+import { collectContainers, collectHosts, collectPods, collectServices } from '../collectors';
 import { CollectorRunner } from './collector_runner';
 
 export interface ImplicitCollectionOptions {