From b01ed4df692d2afd881fff7cc30782d5c020a9c1 Mon Sep 17 00:00:00 2001 From: chrisronline Date: Wed, 23 Sep 2020 13:49:28 -0400 Subject: [PATCH] Fix typings --- .../kibana_monitoring/collectors/get_usage_collector.ts | 4 ++-- .../server/kibana_monitoring/collectors/index.ts | 4 ++-- .../kibana_monitoring/collectors/lib/fetch_es_usage.ts | 4 ++-- .../collectors/lib/fetch_license_type.ts | 3 ++- .../collectors/lib/fetch_stack_product_usage.ts | 4 ++-- .../collectors/lib/get_stack_products_usage.ts | 8 ++++---- .../public/typings/fetch_overview_data/index.ts | 5 ++++- x-pack/plugins/observability/typings/common.ts | 1 + 8 files changed, 19 insertions(+), 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 index 3759cbb61e8c13..b743a5f8e0b4fa 100644 --- 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({ 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 index 60380728a5cff3..47ad78b29962c6 100644 --- 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 index 5d1b0b3fb2b529..de0a1b8f99d968 100644 --- 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 { 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 index 327753f0078e3a..f7b8b72637b1ff 100644 --- 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/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts index e33a2632aa1ee6..df18b28d36c617 100644 --- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts +++ b/x-pack/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/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts index 815d507f382c07..ffa15168d5c8ae 100644 --- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts +++ b/x-pack/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,7 +60,7 @@ export const getStackProductsUsage = async ( clusterUuid, beatsIndex, 'beats_stats', - 'beats_stats.beats.uuid' + 'beats_stats.beat.uuid' ), fetchStackProductUsage( config, @@ -68,7 +68,7 @@ export const getStackProductsUsage = async ( 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 index 4dde78fb4cebb8..a87ae3fb261593 100644 --- 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 = ( export type HasData = () => Promise; -export type ObservabilityFetchDataPlugins = Exclude; +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 index c48c54941ff78a..845652031a5782 100644 --- 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 extends (...args: any[]) => Promise