[7.9] [Telemetry] Swallow errors in opt-in remote notification from t…

…he server (#75641) (#75787)
elastic · Aug 24, 2020 · c00241a · c00241a
1 parent 8e8bb4a
commit c00241a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/plugins/telemetry/server/plugin.ts b/src/plugins/telemetry/server/plugin.ts
@@ -89,6 +89,7 @@ export class TelemetryPlugin implements Plugin {
       config$,
       currentKibanaVersion,
       isDev,
+      logger: this.logger,
       router,
       telemetryCollectionManager,
     });

diff --git a/src/plugins/telemetry/server/routes/index.ts b/src/plugins/telemetry/server/routes/index.ts
@@ -18,7 +18,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { IRouter } from 'kibana/server';
+import { IRouter, Logger } from 'kibana/server';
 import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
 import { registerTelemetryOptInRoutes } from './telemetry_opt_in';
 import { registerTelemetryUsageStatsRoutes } from './telemetry_usage_stats';
@@ -28,6 +28,7 @@ import { TelemetryConfigType } from '../config';
 
 interface RegisterRoutesParams {
   isDev: boolean;
+  logger: Logger;
   config$: Observable<TelemetryConfigType>;
   currentKibanaVersion: string;
   router: IRouter;

diff --git a/src/plugins/telemetry/server/routes/telemetry_opt_in.ts b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
@@ -21,7 +21,7 @@ import moment from 'moment';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter, Logger } from 'kibana/server';
 import {
   StatsGetterConfig,
   TelemetryCollectionManagerPluginSetup,
@@ -39,12 +39,14 @@ import { TelemetryConfigType } from '../config';
 interface RegisterOptInRoutesParams {
   currentKibanaVersion: string;
   router: IRouter;
+  logger: Logger;
   config$: Observable<TelemetryConfigType>;
   telemetryCollectionManager: TelemetryCollectionManagerPluginSetup;
 }
 
 export function registerTelemetryOptInRoutes({
   config$,
+  logger,
   router,
   currentKibanaVersion,
   telemetryCollectionManager,
@@ -95,11 +97,16 @@ export function registerTelemetryOptInRoutes({
 
       if (config.sendUsageFrom === 'server') {
         const optInStatusUrl = config.optInStatusUrl;
-        await sendTelemetryOptInStatus(
+        sendTelemetryOptInStatus(
           telemetryCollectionManager,
           { optInStatusUrl, newOptInStatus },
           statsGetterConfig
-        );
+        ).catch((err) => {
+          // The server is likely behind a firewall and can't reach the remote service
+          logger.warn(
+            `Failed to notify "${optInStatusUrl}" from the server about the opt-in selection. Possibly blocked by a firewall? - Error: ${err.message}`
+          );
+        });
       }
 
       await updateTelemetrySavedObject(context.core.savedObjects.client, attributes);