Merge branch 'master' into logs-ui-reimplement-source-routes-as-http

.github/paths-labeller.yml

@@ -8,6 +8,9 @@
   - "Feature:ExpressionLanguage":
     - "src/plugins/expressions/**/*.*"
     - "src/plugins/bfetch/**/*.*"
+  - "Team:apm"
+    - "x-pack/plugins/apm/**/*.*"
+    - "x-pack/legacy/plugins/apm/**/*.*"
   - "Team:uptime":
     - "x-pack/plugins/uptime/**/*.*"
     - "x-pack/legacy/plugins/uptime/**/*.*"

docs/visualize/lens.asciidoc

@@ -14,20 +14,6 @@ beta[]
 
 * Save your visualization for use in a dashboard.
 
-[float]
-[[lens-aggregation]]
-=== Supported aggregations
-
-Lens supports the following aggregations:
-
-* <<visualize-metric-aggregations,Metric>>
-
-* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
-
-* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
-
-* <<visualize-bucket-aggregations,Bucket>>
-
 [float]
 [[drag-drop]]
 === Drag and drop

docs/visualize/most-frequent.asciidoc

@@ -13,20 +13,6 @@ The most frequently used visualizations include:
 
 [[metric-chart]]
 
-[float]
-[[frequently-used-viz-aggregation]]
-=== Supported aggregations
-
-The most frequently used visualizations support the following aggregations:
-
-* <<visualize-metric-aggregations,Metric>>
-
-* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
-
-* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
-
-* <<visualize-bucket-aggregations,Bucket>>
-
 [float]
 === Configure your visualization
 

docs/visualize/tilemap.asciidoc

@@ -6,19 +6,6 @@ Display graphical representations of data where the individual values are repres
 [role="screenshot"]
 image::images/visualize_heat_map_example.png[]
 
-[float]
-[[build-heat-map]]
-=== Build a heat map
-
-To display your data on the heat map, use the supported aggregations.
-
-Heat maps support the following aggregations:
-
-* <<visualize-metric-aggregations,Metric>>
-* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
-* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
-* <<visualize-bucket-aggregations,Bucket>>
-
 [float]
 [[navigate-heatmap]]
 === Change the color ranges

docs/visualize/tsvb.asciidoc

@@ -43,18 +43,6 @@ Table:: Display data from multiple time series by defining the field group to sh
 [role="screenshot"]
 image:images/tsvb-table.png["Table visualization"]
 
-[float]
-[[tsvb-aggregation]]
-=== Supported aggregations
-
-TSVB supports the following aggregations:
-
-* <<visualize-metric-aggregations,Metric>>
-
-* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
-
-* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
-
 [float]
 [[create-tsvb-visualization]]
 === Create TSVB visualizations

packages/kbn-optimizer/src/worker/webpack.config.ts

@@ -289,6 +289,7 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
 
     resolve: {
       extensions: ['.js', '.ts', '.tsx', '.json'],
+      mainFields: ['browser', 'main'],
       alias: {
         tinymath: require.resolve('tinymath/lib/tinymath.es5.js'),
       },

src/plugins/telemetry/public/mocks.ts

@@ -25,11 +25,20 @@ import { httpServiceMock } from '../../../core/public/http/http_service.mock';
 import { notificationServiceMock } from '../../../core/public/notifications/notifications_service.mock';
 import { TelemetryService } from './services/telemetry_service';
 import { TelemetryNotifications } from './services/telemetry_notifications/telemetry_notifications';
-import { TelemetryPluginStart } from './plugin';
+import { TelemetryPluginStart, TelemetryPluginConfig } from './plugin';
+
+// The following is to be able to access private methods
+/* eslint-disable dot-notation */
+
+export interface TelemetryServiceMockOptions {
+  reportOptInStatusChange?: boolean;
+  config?: Partial<TelemetryPluginConfig>;
+}
 
 export function mockTelemetryService({
   reportOptInStatusChange,
-}: { reportOptInStatusChange?: boolean } = {}) {
+  config: configOverride = {},
+}: TelemetryServiceMockOptions = {}) {
   const config = {
     enabled: true,
     url: 'http://localhost',
@@ -39,14 +48,22 @@ export function mockTelemetryService({
     banner: true,
     allowChangingOptInStatus: true,
     telemetryNotifyUserAboutOptInDefault: true,
+    ...configOverride,
   };
 
-  return new TelemetryService({
+  const telemetryService = new TelemetryService({
     config,
     http: httpServiceMock.createStartContract(),
     notifications: notificationServiceMock.createStartContract(),
     reportOptInStatusChange,
   });
+
+  const originalReportOptInStatus = telemetryService['reportOptInStatus'];
+  telemetryService['reportOptInStatus'] = jest.fn().mockImplementation(optInPayload => {
+    return originalReportOptInStatus(optInPayload); // Actually calling the original method
+  });
+
+  return telemetryService;
 }
 
 export function mockTelemetryNotifications({

src/plugins/telemetry/public/services/telemetry_service.test.ts

@@ -67,17 +67,31 @@ describe('TelemetryService', () => {
   });
 
   describe('setOptIn', () => {
+    it('does not call the api if canChangeOptInStatus==false', async () => {
+      const telemetryService = mockTelemetryService({
+        reportOptInStatusChange: false,
+        config: { allowChangingOptInStatus: false },
+      });
+      expect(await telemetryService.setOptIn(true)).toBe(false);
+
+      expect(telemetryService['http'].post).toBeCalledTimes(0);
+    });
+
     it('calls api if canChangeOptInStatus', async () => {
-      const telemetryService = mockTelemetryService({ reportOptInStatusChange: false });
-      telemetryService.getCanChangeOptInStatus = jest.fn().mockReturnValue(true);
+      const telemetryService = mockTelemetryService({
+        reportOptInStatusChange: false,
+        config: { allowChangingOptInStatus: true },
+      });
       await telemetryService.setOptIn(true);
 
       expect(telemetryService['http'].post).toBeCalledTimes(1);
     });
 
     it('sends enabled true if optedIn: true', async () => {
-      const telemetryService = mockTelemetryService({ reportOptInStatusChange: false });
-      telemetryService.getCanChangeOptInStatus = jest.fn().mockReturnValue(true);
+      const telemetryService = mockTelemetryService({
+        reportOptInStatusChange: false,
+        config: { allowChangingOptInStatus: true },
+      });
       const optedIn = true;
       await telemetryService.setOptIn(optedIn);
 
@@ -87,8 +101,10 @@ describe('TelemetryService', () => {
     });
 
     it('sends enabled false if optedIn: false', async () => {
-      const telemetryService = mockTelemetryService({ reportOptInStatusChange: false });
-      telemetryService.getCanChangeOptInStatus = jest.fn().mockReturnValue(true);
+      const telemetryService = mockTelemetryService({
+        reportOptInStatusChange: false,
+        config: { allowChangingOptInStatus: true },
+      });
       const optedIn = false;
       await telemetryService.setOptIn(optedIn);
 
@@ -98,29 +114,32 @@ describe('TelemetryService', () => {
     });
 
     it('does not call reportOptInStatus if reportOptInStatusChange is false', async () => {
-      const telemetryService = mockTelemetryService({ reportOptInStatusChange: false });
-      telemetryService.getCanChangeOptInStatus = jest.fn().mockReturnValue(true);
-      telemetryService['reportOptInStatus'] = jest.fn();
+      const telemetryService = mockTelemetryService({
+        reportOptInStatusChange: false,
+        config: { allowChangingOptInStatus: true },
+      });
       await telemetryService.setOptIn(true);
 
       expect(telemetryService['reportOptInStatus']).toBeCalledTimes(0);
       expect(telemetryService['http'].post).toBeCalledTimes(1);
     });
 
     it('calls reportOptInStatus if reportOptInStatusChange is true', async () => {
-      const telemetryService = mockTelemetryService({ reportOptInStatusChange: true });
-      telemetryService.getCanChangeOptInStatus = jest.fn().mockReturnValue(true);
-      telemetryService['reportOptInStatus'] = jest.fn();
+      const telemetryService = mockTelemetryService({
+        reportOptInStatusChange: true,
+        config: { allowChangingOptInStatus: true },
+      });
       await telemetryService.setOptIn(true);
 
       expect(telemetryService['reportOptInStatus']).toBeCalledTimes(1);
       expect(telemetryService['http'].post).toBeCalledTimes(1);
     });
 
     it('adds an error toast on api error', async () => {
-      const telemetryService = mockTelemetryService({ reportOptInStatusChange: false });
-      telemetryService.getCanChangeOptInStatus = jest.fn().mockReturnValue(true);
-      telemetryService['reportOptInStatus'] = jest.fn();
+      const telemetryService = mockTelemetryService({
+        reportOptInStatusChange: false,
+        config: { allowChangingOptInStatus: true },
+      });
       telemetryService['http'].post = jest.fn().mockImplementation((url: string) => {
         if (url === '/api/telemetry/v2/optIn') {
           throw Error('failed to update opt in.');
@@ -133,9 +152,13 @@ describe('TelemetryService', () => {
       expect(telemetryService['notifications'].toasts.addError).toBeCalledTimes(1);
     });
 
+    // This one should not happen because the entire method is fully caught but hey! :)
     it('adds an error toast on reportOptInStatus error', async () => {
-      const telemetryService = mockTelemetryService({ reportOptInStatusChange: true });
-      telemetryService.getCanChangeOptInStatus = jest.fn().mockReturnValue(true);
+      const telemetryService = mockTelemetryService({
+        reportOptInStatusChange: true,
+        config: { allowChangingOptInStatus: true },
+      });
+
       telemetryService['reportOptInStatus'] = jest.fn().mockImplementation(() => {
         throw Error('failed to report OptIn Status.');
       });
@@ -146,4 +169,50 @@ describe('TelemetryService', () => {
       expect(telemetryService['notifications'].toasts.addError).toBeCalledTimes(1);
     });
   });
+
+  describe('getTelemetryUrl', () => {
+    it('should return the config.url parameter', async () => {
+      const url = 'http://test.com';
+      const telemetryService = mockTelemetryService({
+        config: { url },
+      });
+
+      expect(telemetryService.getTelemetryUrl()).toBe(url);
+    });
+  });
+
+  describe('setUserHasSeenNotice', () => {
+    it('should hit the API and change the config', async () => {
+      const telemetryService = mockTelemetryService({
+        config: { telemetryNotifyUserAboutOptInDefault: undefined },
+      });
+
+      expect(telemetryService.userHasSeenOptedInNotice).toBe(undefined);
+      expect(telemetryService.getUserHasSeenOptedInNotice()).toBe(false);
+      await telemetryService.setUserHasSeenNotice();
+      expect(telemetryService['http'].put).toBeCalledTimes(1);
+      expect(telemetryService.userHasSeenOptedInNotice).toBe(true);
+      expect(telemetryService.getUserHasSeenOptedInNotice()).toBe(true);
+    });
+
+    it('should show a toast notification if the request fail', async () => {
+      const telemetryService = mockTelemetryService({
+        config: { telemetryNotifyUserAboutOptInDefault: undefined },
+      });
+
+      telemetryService['http'].put = jest.fn().mockImplementation((url: string) => {
+        if (url === '/api/telemetry/v2/userHasSeenNotice') {
+          throw Error('failed to update opt in.');
+        }
+      });
+
+      expect(telemetryService.userHasSeenOptedInNotice).toBe(undefined);
+      expect(telemetryService.getUserHasSeenOptedInNotice()).toBe(false);
+      await telemetryService.setUserHasSeenNotice();
+      expect(telemetryService['http'].put).toBeCalledTimes(1);
+      expect(telemetryService['notifications'].toasts.addError).toBeCalledTimes(1);
+      expect(telemetryService.userHasSeenOptedInNotice).toBe(false);
+      expect(telemetryService.getUserHasSeenOptedInNotice()).toBe(false);
+    });
+  });
 });

src/plugins/telemetry/public/services/telemetry_service.ts

@@ -122,11 +122,15 @@ export class TelemetryService {
     }
 
     try {
-      await this.http.post('/api/telemetry/v2/optIn', {
+      // Report the option to the Kibana server to store the settings.
+      // It returns the encrypted update to send to the telemetry cluster [{cluster_uuid, opt_in_status}]
+      const optInPayload = await this.http.post<string[]>('/api/telemetry/v2/optIn', {
         body: JSON.stringify({ enabled: optedIn }),
       });
       if (this.reportOptInStatusChange) {
-        await this.reportOptInStatus(optedIn);
+        // Use the response to report about the change to the remote telemetry cluster.
+        // If it's opt-out, this will be the last communication to the remote service.
+        await this.reportOptInStatus(optInPayload);
       }
       this.isOptedIn = optedIn;
     } catch (err) {
@@ -162,7 +166,11 @@ export class TelemetryService {
     }
   };
 
-  private reportOptInStatus = async (OptInStatus: boolean): Promise<void> => {
+  /**
+   * Pushes the encrypted payload [{cluster_uuid, opt_in_status}] to the remote telemetry service
+   * @param optInPayload [{cluster_uuid, opt_in_status}] encrypted by the server into an array of strings
+   */
+  private reportOptInStatus = async (optInPayload: string[]): Promise<void> => {
     const telemetryOptInStatusUrl = this.getOptInStatusUrl();
 
     try {
@@ -171,7 +179,7 @@ export class TelemetryService {
         headers: {
           'Content-Type': 'application/json',
         },
-        body: JSON.stringify({ enabled: OptInStatus }),
+        body: JSON.stringify(optInPayload),
       });
     } catch (err) {
       // Sending the ping is best-effort. Telemetry tries to send the ping once and discards it immediately if sending fails.