config as observable

x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts

@@ -6,35 +6,29 @@
 
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { KIBANA_CLOUD_STATS_TYPE } from '../../common/constants';
-import { CoreSetup } from 'kibana/server';
 
-export interface UsageStats {
+interface Config {
   isCloudEnabled: boolean;
 }
 
-export function createCollectorFetch(core: CoreSetup) {
-  return async function fetchUsageStats(): Promise<UsageStats> {
-    const cloudId = core.getServerConfig().get<string>('xpack.cloud.id', null);
-
-    return {
-      isCloudEnabled: !!cloudId,
-    };
-  };
-}
-
-export function createCloudUsageCollector(usageCollection: UsageCollectionSetup, core: CoreSetup) {
+export function createCloudUsageCollector(usageCollection: UsageCollectionSetup, config: Config) {
+  const { isCloudEnabled } = config;
   return usageCollection.makeUsageCollector({
     type: KIBANA_CLOUD_STATS_TYPE,
     isReady: () => true,
-    fetch: createCollectorFetch(core),
+    fetch: () => {
+      return {
+        isCloudEnabled,
+      };
+    }
   });
 }
 
-export function registerCloudUsageCollector(usageCollection: UsageCollectionSetup, core: CoreSetup) {
+export function registerCloudUsageCollector(usageCollection: UsageCollectionSetup | undefined, config: Config) {
   if (!usageCollection) {
     return;
   }
 
-  const collector = createCloudUsageCollector(usageCollection, core);
+  const collector = createCloudUsageCollector(usageCollection, config);
   usageCollection.registerCollector(collector);
 }

x-pack/plugins/cloud/server/plugin.ts

@@ -4,18 +4,23 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { first } from 'rxjs/operators';
-// import { first, take, takeUntil } from 'rxjs/operators';
+import { first, Observable } from 'rxjs/operators';
+import { Observable } from 'rxjs';
 import { CloudConfigSchema } from './config';
+import { registerCloudUsageCollector } from './collectors';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import {
   CoreSetup,
   Logger,
   Plugin,
   PluginInitializerContext,
 } from 'src/core/server';
 
+interface PluginsSetup {
+  usageCollection?: UsageCollectionSetup;
+}
 export interface CloudSetup {
-
+  isCloudEnabled: boolean;
 }
 
 export class CloudPlugin implements Plugin<CloudSetup> {
@@ -27,11 +32,15 @@ export class CloudPlugin implements Plugin<CloudSetup> {
     this.config$ = this.context.config.create<CloudConfigSchema>();
   }
 
-  public async setup(core: CoreSetup) {
+  public async setup(core: CoreSetup, { usageCollection }: PluginsSetup) {
     this.logger.debug('Setting up Cloud plugin');
     const config = await this.config$.pipe(first()).toPromise();
-    console.log('config::', config);
-    return {};
+    const isCloudEnabled = !!config.id;
+    registerCloudUsageCollector(usageCollection, { isCloudEnabled })
+
+    return {
+      isCloudEnabled,
+    };
   }
 
   public start() {}