Merge branch 'master' into search_profiler

elastic · May 6, 2020 · 9550b1e · 9550b1e
2 parents f575404 + e5abec1
commit 9550b1e
Show file tree

Hide file tree

Showing 13,968 changed files with 411,827 additions and 330,793 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -1,5 +1,31 @@
 {
   "upstream": "elastic/kibana",
-  "branches": [{ "name": "7.x", "checked": true }, "7.7", "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
-  "labels": ["backport"]
+  "targetBranchChoices": [
+    { "name": "master", "checked": true },
+    { "name": "7.x", "checked": true },
+    "7.8",
+    "7.7",
+    "7.6",
+    "7.5",
+    "7.4",
+    "7.3",
+    "7.2",
+    "7.1",
+    "7.0",
+    "6.8",
+    "6.7",
+    "6.6",
+    "6.5",
+    "6.4",
+    "6.3",
+    "6.2",
+    "6.1",
+    "6.0",
+    "5.6"
+  ],
+  "targetPRLabels": ["backport"],
+  "branchLabelMapping": {
+    "^v7.8.0$": "7.x",
+    "^v(\\d+).(\\d+).\\d+$": "$1.$2"
+  }
 }
diff --git a/.ci/Jenkinsfile_coverage b/.ci/Jenkinsfile_coverage
@@ -3,7 +3,7 @@
 library 'kibana-pipeline-library'
 kibanaLibrary.load() // load from the Jenkins instance
 
-kibanaPipeline(timeoutMinutes: 180) {
+kibanaPipeline(timeoutMinutes: 240) {
   catchErrors {
     withEnv([
       'CODE_COVERAGE=1', // Needed for multiple ci scripts, such as remote.ts, test/scripts/*.sh, schema.js, etc.

diff --git a/.ci/end2end.groovy b/.ci/end2end.groovy
@@ -13,7 +13,7 @@ pipeline {
     BASE_DIR = 'src/github.com/elastic/kibana'
     HOME = "${env.WORKSPACE}"
     APM_ITS = 'apm-integration-testing'
-    CYPRESS_DIR = 'x-pack/legacy/plugins/apm/e2e'
+    CYPRESS_DIR = 'x-pack/plugins/apm/e2e'
     PIPELINE_LOG_LEVEL = 'DEBUG'
   }
   options {
@@ -39,7 +39,7 @@ pipeline {
                     shallow: false, reference: "/var/lib/jenkins/.git-references/kibana.git")
         script {
           dir("${BASE_DIR}"){
-            def regexps =[ "^x-pack/legacy/plugins/apm/.*" ]
+            def regexps =[ "^x-pack/plugins/apm/.*" ]
             env.APM_UPDATED = isGitRegionMatch(patterns: regexps)
           }
         }

diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es
@@ -19,42 +19,48 @@ currentBuild.description = "ES: ${SNAPSHOT_VERSION}<br />Kibana: ${params.branch
 
 def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${SNAPSHOT_VERSION}/archives/${SNAPSHOT_ID}/manifest.json"
 
-kibanaPipeline(timeoutMinutes: 120) {
+kibanaPipeline(timeoutMinutes: 150) {
   catchErrors {
-    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),
-          'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
-          'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
-          'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
-          'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
-          'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
-          'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
-          'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
-          'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
-          'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
-          'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
-        ]),
-        'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
-          'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
-          'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
-          'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
-          'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
-          'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
-          'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
-          'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
-          'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
-          'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
-          'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
-        ]),
-      ])
-    }
+    slackNotifications.onFailure(
+      title: ":broken_heart: *<${env.BUILD_URL}|[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure>*",
+      message: ":broken_heart: [${SNAPSHOT_VERSION}] ES Snapshot Verification Failure",
+    ) {
+      retryable.enable(2)
+      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),
+            'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
+            'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
+            'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
+            'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
+            'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
+            'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
+            'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
+            'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
+            'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
+            'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
+          ]),
+          'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
+            'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
+            'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
+            'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
+            'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
+            'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
+            'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
+            'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
+            'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
+            'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
+            'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
+          ]),
+        ])
+      }
 
-    promoteSnapshot(SNAPSHOT_VERSION, SNAPSHOT_ID)
+      promoteSnapshot(SNAPSHOT_VERSION, SNAPSHOT_ID)
+    }
   }
 
   kibanaPipeline.sendMail()

diff --git a/.eslintignore b/.eslintignore
@@ -1,46 +1,49 @@
-node_modules
-bower_components
-/data
-/optimize
-/build
-/target
+**/*.js.snap
+**/graphql/types.ts
 /.es
-/plugins
+/build
 /built_assets
+/data
 /html_docs
-/src/plugins/data/common/es_query/kuery/ast/_generated_/**
-/src/legacy/core_plugins/vis_type_timelion/public/_generated_/**
-src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
-/src/legacy/ui/public/flot-charts
+/optimize
+/plugins
 /test/fixtures/scenarios
-/src/legacy/core_plugins/console/public/webpackShims
+/x-pack/build
+node_modules
+target
+
+!/.eslintrc.js
+
+# plugin overrides
+/src/core/lib/kbn_internal_native_observable
 /src/legacy/core_plugins/console/public/tests/webpackShims
+/src/legacy/core_plugins/console/public/webpackShims
+/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
+/src/legacy/ui/public/flot-charts
 /src/legacy/ui/public/utils/decode_geo_hash.js
-/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
-/src/core/lib/kbn_internal_native_observable
-/packages/*/target
+/src/plugins/data/common/es_query/kuery/ast/_generated_/**
+/src/plugins/vis_type_timelion/public/_generated_/**
+/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
+/x-pack/legacy/plugins/**/__tests__/fixtures/**
+/x-pack/plugins/apm/e2e/cypress/**/snapshots.js
+/x-pack/plugins/canvas/canvas_plugin
+/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
+/x-pack/plugins/canvas/shareable_runtime/build
+/x-pack/plugins/canvas/storybook
+/x-pack/plugins/monitoring/public/lib/jquery_flot
+/x-pack/legacy/plugins/infra/common/graphql/types.ts
+/x-pack/legacy/plugins/infra/public/graphql/types.ts
+/x-pack/legacy/plugins/infra/server/graphql/types.ts
+/x-pack/legacy/plugins/maps/public/vendor/**
+
+# package overrides
 /packages/eslint-config-kibana
-/packages/kbn-pm/dist
+/packages/kbn-interpreter/src/common/lib/grammar.js
 /packages/kbn-plugin-generator/sao_template/template
+/packages/kbn-pm/dist
+/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
+/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
 /packages/kbn-ui-framework/dist
 /packages/kbn-ui-framework/doc_site/build
 /packages/kbn-ui-framework/generator-kui/*/templates/
-/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
-/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
-/x-pack/legacy/plugins/maps/public/vendor/**
-/x-pack/coverage
-/x-pack/build
-/x-pack/legacy/plugins/**/__tests__/fixtures/**
-/packages/kbn-interpreter/src/common/lib/grammar.js
-/x-pack/legacy/plugins/canvas/canvas_plugin
-/x-pack/legacy/plugins/canvas/shareable_runtime/build
-/x-pack/legacy/plugins/canvas/storybook
-/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
-/x-pack/legacy/plugins/infra/common/graphql/types.ts
-/x-pack/legacy/plugins/infra/public/graphql/types.ts
-/x-pack/legacy/plugins/infra/server/graphql/types.ts
-/x-pack/legacy/plugins/apm/e2e/cypress/**/snapshots.js
-/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
-**/graphql/types.ts
-**/*.js.snap
-!/.eslintrc.js
+