Fix typings

elastic · Sep 23, 2020 · b01ed4d · b01ed4d
1 parent 11e1077
commit b01ed4d
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
@@ -5,7 +5,7 @@
  */
 
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
+import { LegacyAPICaller } from 'src/core/server';
 import { MonitoringConfig } from '../../config';
 import { fetchAvailableCcs } from '../../lib/alerts/fetch_available_ccs';
 import { getStackProductsUsage } from './lib/get_stack_products_usage';
@@ -18,7 +18,7 @@ import { fetchClusters } from '../../lib/alerts/fetch_clusters';
 export function getMonitoringUsageCollector(
   usageCollection: UsageCollectionSetup,
   config: MonitoringConfig,
-  callCluster: CallCluster
+  callCluster: LegacyAPICaller
 ) {
   return usageCollection.makeUsageCollector<MonitoringUsage>({
     type: 'monitoring',

diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
+import { LegacyAPICaller } from 'src/core/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { getSettingsCollector } from './get_settings_collector';
 import { getMonitoringUsageCollector } from './get_usage_collector';
@@ -15,7 +15,7 @@ export { KibanaSettingsCollector } from './get_settings_collector';
 export function registerCollectors(
   usageCollection: UsageCollectionSetup,
   config: MonitoringConfig,
-  callCluster: CallCluster
+  callCluster: LegacyAPICaller
 ) {
   usageCollection.registerCollector(getSettingsCollector(usageCollection, config));
   usageCollection.registerCollector(

diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
+import { LegacyAPICaller } from 'src/core/server';
 import { get } from 'lodash';
 import { MonitoringConfig } from '../../../config';
 import { StackProductUsage } from '../types';
@@ -41,7 +41,7 @@ interface ClusterStats {
 
 export async function fetchESUsage(
   config: MonitoringConfig,
-  callCluster: CallCluster,
+  callCluster: LegacyAPICaller,
   clusterUuid: string,
   index: string
 ): Promise<StackProductUsage> {

diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts
@@ -5,11 +5,12 @@
  */
 
 import { get } from 'lodash';
+import { LegacyAPICaller } from 'src/core/server';
 import { INDEX_PATTERN_ELASTICSEARCH } from '../../../../common/constants';
 import { getCcsIndexPattern } from '../../../lib/alerts/get_ccs_index_pattern';
 
 export async function fetchLicenseType(
-  callCluster: any,
+  callCluster: LegacyAPICaller,
   availableCcs: string[],
   clusterUuid: string
 ) {

diff --git a/...k/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts b/...k/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
 import { get } from 'lodash';
+import { LegacyAPICaller } from 'src/core/server';
 import { MonitoringConfig } from '../../../config';
 // @ts-ignore
 import { prefixIndexPattern } from '../../../lib/ccs_utils';
@@ -32,7 +32,7 @@ interface KeyBucket {
 
 export async function fetchStackProductUsage(
   config: MonitoringConfig,
-  callCluster: CallCluster,
+  callCluster: LegacyAPICaller,
   clusterUuid: string,
   index: string,
   type: string,

diff --git a/...ck/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts b/...ck/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
+import { LegacyAPICaller } from 'src/core/server';
 import { MonitoringClusterStackProductUsage } from '../types';
 import { fetchESUsage } from './fetch_es_usage';
 import { MonitoringConfig } from '../../../config';
@@ -23,7 +23,7 @@ import { getCcsIndexPattern } from '../../../lib/alerts/get_ccs_index_pattern';
 
 export const getStackProductsUsage = async (
   config: MonitoringConfig,
-  callCluster: CallCluster,
+  callCluster: LegacyAPICaller,
   availableCcs: string[],
   clusterUuid: string
 ): Promise<
@@ -60,15 +60,15 @@ export const getStackProductsUsage = async (
       clusterUuid,
       beatsIndex,
       'beats_stats',
-      'beats_stats.beats.uuid'
+      'beats_stats.beat.uuid'
     ),
     fetchStackProductUsage(
       config,
       callCluster,
       clusterUuid,
       beatsIndex,
       'beats_stats',
-      'beats_stats.beats.uuid',
+      'beats_stats.beat.uuid',
       [{ term: { 'beats_stats.beat.type': 'apm-server' } }]
     ),
   ]);

diff --git a/x-pack/plugins/observability/public/typings/fetch_overview_data/index.ts b/x-pack/plugins/observability/public/typings/fetch_overview_data/index.ts
@@ -32,7 +32,10 @@ export type FetchData<T extends FetchDataResponse = FetchDataResponse> = (
 
 export type HasData = () => Promise<boolean>;
 
-export type ObservabilityFetchDataPlugins = Exclude<ObservabilityApp, 'observability'>;
+export type ObservabilityFetchDataPlugins = Exclude<
+  ObservabilityApp,
+  'observability' | 'stack_monitoring'
+>;
 
 export interface DataHandler<
   T extends ObservabilityFetchDataPlugins = ObservabilityFetchDataPlugins

diff --git a/x-pack/plugins/observability/typings/common.ts b/x-pack/plugins/observability/typings/common.ts
@@ -9,6 +9,7 @@ export type ObservabilityApp =
   | 'infra_logs'
   | 'apm'
   | 'uptime'
+  | 'observability'
   | 'stack_monitoring';
 
 export type PromiseReturnType<Func> = Func extends (...args: any[]) => Promise<infer Value>