Merge branch 'master' of github.com:elastic/kibana into ilm/basic-a11…

…y-tests

* 'master' of github.com:elastic/kibana: (276 commits)
  [Telemetry] Settings Collector: redact sensitive reported values (elastic#88675)
  [CI] Combines Jest test jobs (elastic#85850)
  [Upgrade Assistant] Migrate server to new es-js client (elastic#89207)
  Migrate maps_legacy, maps_oss, region_map, and tile_map plugions to TS projects (elastic#89351)
  [Vega Docs] Add experimental flag on the vega maps title (elastic#89402)
  Increase the time needed to locate the save viz toast (elastic#89301)
  [Enterprise Search] Add links to doc links service (elastic#89260)
  Fixed regex bug in Safari (elastic#89399)
  [Lens] Fix indexpattern checks for missing references (elastic#88840)
  [Lens] Clean up usage collector (elastic#89109)
  update apm index pattern (elastic#89395)
  [APM] Upgrade ES client (elastic#86594)
  Enable v2 so migrations, disable in FTR tests (elastic#89297)
  [Search Sessions] Make search session indicator UI opt-in, refactor per-app capabilities (elastic#88699)
  Cleanup OSS code from visualizations wizard (elastic#89092)
  [APM] Optimize API test order (elastic#88654)
  Rename conversion function, extract to module scope and add tests. (elastic#89018)
  [core.logging] Add ops logs to the KP logging system (elastic#88070)
  chore(NA): improve ts build refs performance on kbn bootstrap (elastic#89333)
  skip flaky suite (elastic#89379)
  ...

# Conflicts:
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.tsx
#	x-pack/test/accessibility/config.ts

.browserslistrc

@@ -2,10 +2,10 @@
 last 2 Firefox versions
 last 2 Chrome versions
 last 2 Safari versions
-> 0.25%
-not ie 11
-not op_mini all
-not samsung 4
+last 2 Edge versions
+last 1 ios_saf versions
+last 1 and_chr versions
+last 1 samsung versions
 
 [dev]
 last 1 chrome versions

.ci/Jenkinsfile_flaky

@@ -5,11 +5,10 @@ kibanaLibrary.load()
 
 def CI_GROUP_PARAM = params.CI_GROUP
 
-// Looks like 'oss:ciGroup:1', 'oss:firefoxSmoke', or 'all:serverMocha'
+// Looks like 'oss:ciGroup:1', 'oss:firefoxSmoke'
 def JOB_PARTS = CI_GROUP_PARAM.split(':')
 def IS_XPACK = JOB_PARTS[0] == 'xpack'
 def JOB = JOB_PARTS[1]
-def NEED_BUILD = JOB != 'serverMocha'
 def CI_GROUP = JOB_PARTS.size() > 2 ? JOB_PARTS[2] : ''
 def EXECUTIONS = params.NUMBER_EXECUTIONS.toInteger()
 def AGENT_COUNT = getAgentCount(EXECUTIONS)
@@ -31,15 +30,13 @@ kibanaPipeline(timeoutMinutes: 180) {
         print "Agent ${agentNumberInside} - ${agentExecutions} executions"
 
         workers.functional('flaky-test-runner', {
-          if (NEED_BUILD) {
-            if (!IS_XPACK) {
-              kibanaPipeline.buildOss()
-              if (CI_GROUP == '1') {
-                runbld("./test/scripts/jenkins_build_kbn_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
-              }
-            } else {
-              kibanaPipeline.buildXpack()
+          if (!IS_XPACK) {
+            kibanaPipeline.buildOss()
+            if (CI_GROUP == '1') {
+              runbld("./test/scripts/jenkins_build_kbn_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
             }
+          } else {
+            kibanaPipeline.buildXpack()
           }
         }, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))()
       }
@@ -60,17 +57,7 @@ kibanaPipeline(timeoutMinutes: 180) {
 
 def getWorkerFromParams(isXpack, job, ciGroup) {
   if (!isXpack) {
-    if (job == 'serverMocha') {
-      return kibanaPipeline.functionalTestProcess('serverMocha', {
-        kibanaPipeline.bash(
-          """
-            source src/dev/ci_setup/setup_env.sh
-            node scripts/mocha
-          """,
-          "run `node scripts/mocha`"
-        )
-      })
-    } else if (job == 'accessibility') {
+    if (job == 'accessibility') {
       return kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh')
     } else if (job == 'firefoxSmoke') {
       return kibanaPipeline.functionalTestProcess('firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh')

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -29,7 +29,6 @@ kibanaPipeline(timeoutMinutes: 150) {
       withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
         parallel([
           'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
-          'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
           'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
             'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
             'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
@@ -56,6 +55,8 @@ kibanaPipeline(timeoutMinutes: 150) {
             'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
             'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
             'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
+            'xpack-ciGroup12': kibanaPipeline.xpackCiGroupProcess(12),
+            'xpack-ciGroup13': kibanaPipeline.xpackCiGroupProcess(13),
           ]),
         ])
       }

.ci/jobs.yml

@@ -2,7 +2,6 @@
 
 JOB:
   - kibana-intake
-  - x-pack-intake
   - kibana-firefoxSmoke
   - kibana-ciGroup1
   - kibana-ciGroup2
@@ -32,6 +31,8 @@ JOB:
   - x-pack-ciGroup9
   - x-pack-ciGroup10
   - x-pack-ciGroup11
+  - x-pack-ciGroup12
+  - x-pack-ciGroup13
   - x-pack-accessibility
   - x-pack-visualRegression
 

.ci/teamcity/checks/stylelint.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+checks-reporter-with-killswitch "Lint: stylelint" \
+  node scripts/stylelint

.ci/teamcity/default/build.sh

@@ -14,6 +14,7 @@ node scripts/build_kibana_platform_plugins \
   --scan-dir "$XPACK_DIR/test/plugin_api_integration/plugins" \
   --scan-dir "$XPACK_DIR/test/plugin_api_perf/plugins" \
   --scan-dir "$XPACK_DIR/test/licensing_plugin/plugins" \
+  --scan-dir "$XPACK_DIR/test/usage_collection/plugins" \
   --verbose
 tc_end_block "Build Platform Plugins"
 

.ci/teamcity/default/build_plugins.sh

@@ -14,6 +14,7 @@ node scripts/build_kibana_platform_plugins \
   --scan-dir "$XPACK_DIR/test/plugin_api_integration/plugins" \
   --scan-dir "$XPACK_DIR/test/plugin_api_perf/plugins" \
   --scan-dir "$XPACK_DIR/test/licensing_plugin/plugins" \
+  --scan-dir "$XPACK_DIR/test/usage_collection/plugins" \
   --verbose
 tc_end_block "Build Platform Plugins"
 

.ci/teamcity/default/jest.sh

@@ -1,10 +1,4 @@
 #!/bin/bash
 
-set -euo pipefail
-
-source "$(dirname "${0}")/../util.sh"
-
-export JOB=kibana-default-jest
-
-checks-reporter-with-killswitch "Jest Unit Tests" \
-  node scripts/jest x-pack --ci --verbose --maxWorkers=5
+# This file is temporary and can be removed once #85850 has been
+# merged and the changes included in open PR's (~3 days after merging)

.ci/teamcity/oss/jest.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 
+# This file is temporary and can be removed once #85850 has been
+# merged and the changes included in open PR's (~3 days after merging)
+
 set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
 export JOB=kibana-oss-jest
 
-checks-reporter-with-killswitch "OSS Jest Unit Tests" \
-  node scripts/jest --config jest.config.oss.js --ci --verbose --maxWorkers=5
+checks-reporter-with-killswitch "Jest Unit Tests" \
+  node scripts/jest --ci --verbose

.ci/teamcity/setup_env.sh

@@ -48,6 +48,7 @@ else
 fi
 
 tc_set_env FLEET_PACKAGE_REGISTRY_PORT 6104 # Any unused port is fine, used by ingest manager tests
+tc_set_env TEST_CORS_SERVER_PORT 6105 # Any unused port is fine, used by ingest manager tests
 
 if [[ "$(which google-chrome-stable)" || "$(which google-chrome)" ]]; then
   echo "Chrome detected, setting DETECT_CHROMEDRIVER_VERSION=true"

.ci/teamcity/tests/jest.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+export JOB=kibana-jest
+
+checks-reporter-with-killswitch "Jest Unit Tests" \
+  node scripts/jest --ci --verbose --coverage

.eslintrc.js

@@ -1,20 +1,9 @@
 /*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
  */
 
 const APACHE_2_0_LICENSE_HEADER = `
@@ -38,6 +27,16 @@ const APACHE_2_0_LICENSE_HEADER = `
  */
 `;
 
+const DUAL_LICENSE_HEADER = `
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
+ */
+`;
+
 const ELASTIC_LICENSE_HEADER = `
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -71,11 +70,6 @@ const SAFER_LODASH_SET_DEFINITELYTYPED_HEADER = `
  */
 `;
 
-const allMochaRulesOff = {};
-Object.keys(require('eslint-plugin-mocha').rules).forEach((k) => {
-  allMochaRulesOff['mocha/' + k] = 'off';
-});
-
 module.exports = {
   root: true,
 
@@ -118,12 +112,47 @@ module.exports = {
     },
 
     /**
-     * Files that require Apache 2.0 headers, settings
+     * Files that require dual-license headers, settings
      * are overridden below for files that require Elastic
      * Licence headers
      */
     {
-      files: ['**/*.{js,mjs,ts,tsx}', '!plugins/**/*'],
+      files: [
+        '**/*.{js,mjs,ts,tsx}',
+        '!plugins/**/*',
+        '!packages/elastic-datemath/**/*',
+        '!packages/elastic-eslint-config-kibana/**/*',
+      ],
+      rules: {
+        '@kbn/eslint/require-license-header': [
+          'error',
+          {
+            license: DUAL_LICENSE_HEADER,
+          },
+        ],
+        '@kbn/eslint/disallow-license-headers': [
+          'error',
+          {
+            licenses: [
+              APACHE_2_0_LICENSE_HEADER,
+              ELASTIC_LICENSE_HEADER,
+              SAFER_LODASH_SET_HEADER,
+              SAFER_LODASH_SET_LODASH_HEADER,
+              SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
+            ],
+          },
+        ],
+      },
+    },
+
+    /**
+     * Files that require Apache headers
+     */
+    {
+      files: [
+        'packages/elastic-datemath/**/*.{js,mjs,ts,tsx}',
+        'packages/elastic-eslint-config-kibana/**/*.{js,mjs,ts,tsx}',
+      ],
       rules: {
         '@kbn/eslint/require-license-header': [
           'error',
@@ -135,6 +164,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               ELASTIC_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,
               SAFER_LODASH_SET_LODASH_HEADER,
@@ -156,7 +186,7 @@ module.exports = {
     },
 
     /**
-     * Files that require Elastic license headers instead of Apache 2.0 header
+     * Files that require Elastic license headers instead of dual-license header
      */
     {
       files: ['x-pack/**/*.{js,mjs,ts,tsx}'],
@@ -171,6 +201,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,
               SAFER_LODASH_SET_LODASH_HEADER,
@@ -197,6 +228,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               ELASTIC_LICENSE_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,
@@ -219,6 +251,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               ELASTIC_LICENSE_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_LODASH_HEADER,
@@ -241,6 +274,7 @@ module.exports = {
           'error',
           {
             licenses: [
+              DUAL_LICENSE_HEADER,
               ELASTIC_LICENSE_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,
@@ -542,7 +576,6 @@ module.exports = {
         'packages/kbn-eslint-import-resolver-kibana/**/*.js',
         'packages/kbn-eslint-plugin-eslint/**/*',
         'x-pack/gulpfile.js',
-        'x-pack/dev-tools/mocha/setup_mocha.js',
         'x-pack/scripts/*.js',
       ],
       excludedFiles: ['**/integration_tests/**/*'],
@@ -574,7 +607,9 @@ module.exports = {
      */
     {
       files: ['test/harden/*.js', 'packages/elastic-safer-lodash-set/test/*.js'],
-      rules: allMochaRulesOff,
+      rules: {
+        'mocha/handle-done-callback': 'off',
+      },
     },
     {
       files: ['**/*.{js,mjs,ts,tsx}'],
@@ -794,7 +829,6 @@ module.exports = {
       files: ['x-pack/plugins/security_solution/**/*.{js,mjs,ts,tsx}'],
       plugins: ['eslint-plugin-node', 'react'],
       env: {
-        mocha: true,
         jest: true,
       },
       rules: {
@@ -930,7 +964,6 @@ module.exports = {
       files: ['x-pack/plugins/lists/**/*.{js,mjs,ts,tsx}'],
       plugins: ['eslint-plugin-node'],
       env: {
-        mocha: true,
         jest: true,
       },
       rules: {