Merge branch 'master' into fixSkippedOverviewTest

.buildkite/scripts/pipelines/pull_request/pipeline.js

@@ -55,24 +55,23 @@ const uploadPipeline = (pipelineContent) => {
     pipeline.push(getPipeline('.buildkite/pipelines/pull_request/base.yml', false));
 
     if (
-      await doAnyChangesMatch([
+      (await doAnyChangesMatch([
         /^x-pack\/plugins\/security_solution/,
         /^x-pack\/test\/security_solution_cypress/,
         /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
         /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/context\/actions_connectors_context\.tsx/,
-      ]) || process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
+      ])) ||
+      process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
     ) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/security_solution.yml'));
     }
 
-    // Disabled for now, these are failing/disabled in Jenkins currently as well
-    // if (
-    //   await doAnyChangesMatch([
-    //     /^x-pack\/plugins\/apm/,
-    //   ]) || process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
-    // ) {
-    //   pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
-    // }
+    if (
+      (await doAnyChangesMatch([/^x-pack\/plugins\/apm/])) ||
+      process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
+    ) {
+      pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
+    }
 
     pipeline.push(getPipeline('.buildkite/pipelines/pull_request/post_build.yml'));
 

packages/kbn-test/src/functional_tests/lib/babel_register_for_test_plugins.js

@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-const Fs = require('fs');
 const Path = require('path');
 
 const { REPO_ROOT } = require('@kbn/dev-utils');
@@ -23,7 +22,7 @@ require('@babel/register')({
     // TODO: should should probably remove this link back to the source
     Path.resolve(REPO_ROOT, 'x-pack/plugins/task_manager/server/config.ts'),
     Path.resolve(REPO_ROOT, 'src/core/utils/default_app_categories.ts'),
-  ].map((path) => Fs.realpathSync(path)),
+  ],
   babelrc: false,
   presets: [require.resolve('@kbn/babel-preset/node_preset')],
   extensions: ['.js', '.ts', '.tsx'],

src/core/server/saved_objects/migrationsv2/integration_tests/batch_size_bytes.test.ts

@@ -26,6 +26,30 @@ async function removeLogFile() {
   // ignore errors if it doesn't exist
   await fs.unlink(logFilePath).catch(() => void 0);
 }
+function sortByTypeAndId(a: { type: string; id: string }, b: { type: string; id: string }) {
+  return a.type.localeCompare(b.type) || a.id.localeCompare(b.id);
+}
+
+async function fetchDocuments(esClient: ElasticsearchClient, index: string) {
+  const { body } = await esClient.search<any>({
+    index,
+    body: {
+      query: {
+        match_all: {},
+      },
+      _source: ['type', 'id'],
+    },
+  });
+
+  return body.hits.hits
+    .map((h) => ({
+      ...h._source,
+      id: h._id,
+    }))
+    .sort(sortByTypeAndId);
+}
+
+const assertMigratedDocuments = (arr: any[], target: any[]) => target.every((v) => arr.includes(v));
 
 describe('migration v2', () => {
   let esServer: kbnTestServer.TestElasticsearchUtils;
@@ -72,16 +96,11 @@ describe('migration v2', () => {
     await new Promise((resolve) => setTimeout(resolve, 5000));
 
     const esClient: ElasticsearchClient = esServer.es.getClient();
-    const migratedIndexResponse = await esClient.count({
-      index: targetIndex,
-    });
-    const oldIndexResponse = await esClient.count({
-      index: '.kibana_7.14.0_001',
-    });
-
-    // Use a >= comparison since once Kibana has started it might create new
-    // documents like telemetry tasks
-    expect(migratedIndexResponse.body.count).toBeGreaterThanOrEqual(oldIndexResponse.body.count);
+
+    // assert that the docs from the original index have been migrated rather than comparing a doc count after startup
+    const originalDocs = await fetchDocuments(esClient, '.kibana_7.14.0_001');
+    const migratedDocs = await fetchDocuments(esClient, targetIndex);
+    expect(assertMigratedDocuments(migratedDocs, originalDocs));
   });
 
   it('fails with a descriptive message when a single document exceeds maxBatchSizeBytes', async () => {

src/core/server/ui_settings/saved_objects/migrations.test.ts

@@ -162,4 +162,28 @@ describe('ui_settings 8.0.0 migrations', () => {
       migrationVersion: {},
     });
   });
+  test('removes telemetry:optIn and xPackMonitoring:allowReport from ui_settings', () => {
+    const doc = {
+      type: 'config',
+      id: '8.0.0',
+      attributes: {
+        buildNum: 9007199254740991,
+        'telemetry:optIn': false,
+        'xPackMonitoring:allowReport': false,
+      },
+      references: [],
+      updated_at: '2020-06-09T20:18:20.349Z',
+      migrationVersion: {},
+    };
+    expect(migration(doc)).toEqual({
+      type: 'config',
+      id: '8.0.0',
+      attributes: {
+        buildNum: 9007199254740991,
+      },
+      references: [],
+      updated_at: '2020-06-09T20:18:20.349Z',
+      migrationVersion: {},
+    });
+  });
 });

src/core/server/ui_settings/saved_objects/migrations.ts

@@ -78,13 +78,16 @@ export const migrations = {
   '8.0.0': (doc: SavedObjectUnsanitizedDoc<any>): SavedObjectSanitizedDoc<any> => ({
     ...doc,
     ...(doc.attributes && {
-      // owner: Team:Geo
       attributes: Object.keys(doc.attributes).reduce(
         (acc, key) =>
           [
+            // owner: Team:Geo
             'visualization:regionmap:showWarnings',
             'visualization:tileMap:WMSdefaults',
             'visualization:tileMap:maxPrecision',
+            // owner: Team:Core
+            'telemetry:optIn',
+            'xPackMonitoring:allowReport',
           ].includes(key)
             ? {
                 ...acc,

src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker

@@ -177,7 +177,6 @@ kibana_vars=(
     telemetry.allowChangingOptInStatus
     telemetry.enabled
     telemetry.optIn
-    telemetry.optInStatusUrl
     telemetry.sendUsageTo
     telemetry.sendUsageFrom
     tilemap.options.attribution

src/plugins/telemetry/common/constants.ts

@@ -6,24 +6,6 @@
  * Side Public License, v 1.
  */
 
-import { i18n } from '@kbn/i18n';
-
-/**
- * config options opt into telemetry
- */
-export const CONFIG_TELEMETRY = 'telemetry:optIn';
-
-/**
- * config description for opting into telemetry
- */
-export const getConfigTelemetryDesc = () => {
-  // Can't find where it's used but copying it over from the legacy code just in case...
-  return i18n.translate('telemetry.telemetryConfigDescription', {
-    defaultMessage:
-      'Help us improve the Elastic Stack by providing usage statistics for basic features. We will not share this data outside of Elastic.',
-  });
-};
-
 /**
  * The amount of time, in milliseconds, to wait between reports when enabled.
  * Currently 24 hours.

src/plugins/telemetry/server/config/config.ts

@@ -9,8 +9,6 @@
 import { schema, TypeOf, Type } from '@kbn/config-schema';
 import { getConfigPath } from '@kbn/utils';
 import { PluginConfigDescriptor } from 'kibana/server';
-import { TELEMETRY_ENDPOINT } from '../../common/constants';
-import { deprecateEndpointConfigs } from './deprecations';
 
 const clusterEnvSchema: [Type<'prod'>, Type<'staging'>] = [
   schema.literal('prod'),
@@ -36,34 +34,6 @@ const configSchema = schema.object({
     schema.oneOf(clusterEnvSchema, { defaultValue: 'staging' }),
     schema.oneOf(clusterEnvSchema, { defaultValue: 'prod' })
   ),
-  /**
-   * REMOVE IN 8.0 - INTERNAL CONFIG DEPRECATED IN 7.15
-   * REPLACED WITH `telemetry.sendUsageTo: staging | prod`
-   */
-  url: schema.conditional(
-    schema.contextRef('dist'),
-    schema.literal(false), // Point to staging if it's not a distributable release
-    schema.string({
-      defaultValue: TELEMETRY_ENDPOINT.MAIN_CHANNEL.STAGING,
-    }),
-    schema.string({
-      defaultValue: TELEMETRY_ENDPOINT.MAIN_CHANNEL.PROD,
-    })
-  ),
-  /**
-   * REMOVE IN 8.0 - INTERNAL CONFIG DEPRECATED IN 7.15
-   * REPLACED WITH `telemetry.sendUsageTo: staging | prod`
-   */
-  optInStatusUrl: schema.conditional(
-    schema.contextRef('dist'),
-    schema.literal(false), // Point to staging if it's not a distributable release
-    schema.string({
-      defaultValue: TELEMETRY_ENDPOINT.OPT_IN_STATUS_CHANNEL.STAGING,
-    }),
-    schema.string({
-      defaultValue: TELEMETRY_ENDPOINT.OPT_IN_STATUS_CHANNEL.PROD,
-    })
-  ),
   sendUsageFrom: schema.oneOf([schema.literal('server'), schema.literal('browser')], {
     defaultValue: 'server',
   }),
@@ -81,5 +51,4 @@ export const config: PluginConfigDescriptor<TelemetryConfigType> = {
     sendUsageFrom: true,
     sendUsageTo: true,
   },
-  deprecations: () => [deprecateEndpointConfigs],
 };