Merge branch 'master' into issues/37386

elastic · May 5, 2020 · 603c86d · 603c86d
2 parents fea2c4d + fc6c78f
commit 603c86d
Show file tree

Hide file tree

Showing 16,444 changed files with 657,661 additions and 451,888 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -1,5 +1,30 @@
 {
   "upstream": "elastic/kibana",
-  "branches": [{ "name": "7.x", "checked": true }, "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.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.
@@ -44,7 +44,7 @@ kibanaPipeline(timeoutMinutes: 180) {
           'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
         ]),
       ])
-      workers.base(name: 'coverage-worker', label: 'tests-l', ramDisk: false, bootstrapped: false) {
+      workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
         kibanaPipeline.downloadCoverageArtifacts()
         kibanaPipeline.bash(
           '''

diff --git a/.ci/Jenkinsfile_flaky b/.ci/Jenkinsfile_flaky
@@ -35,7 +35,7 @@ kibanaPipeline(timeoutMinutes: 180) {
             if (!IS_XPACK) {
               kibanaPipeline.buildOss()
               if (CI_GROUP == '1') {
-                runbld("./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
+                runbld("./test/scripts/jenkins_build_kbn_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
               }
             } else {
               kibanaPipeline.buildXpack()

diff --git a/.ci/Jenkinsfile_visual_baseline b/.ci/Jenkinsfile_visual_baseline
@@ -7,12 +7,12 @@ kibanaPipeline(timeoutMinutes: 120) {
   catchError {
     parallel([
       'oss-visualRegression': {
-        workers.ci(name: 'oss-visualRegression', label: 'linux && immutable', ramDisk: false) {
+        workers.ci(name: 'oss-visualRegression', size: 's', ramDisk: false) {
           kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
         }
       },
       'xpack-visualRegression': {
-        workers.ci(name: 'xpack-visualRegression', label: 'linux && immutable', ramDisk: false) {
+        workers.ci(name: 'xpack-visualRegression', size: 's', ramDisk: false) {
           kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
         }
       },

diff --git a/.ci/es-snapshots/Jenkinsfile_build_es b/.ci/es-snapshots/Jenkinsfile_build_es
@@ -25,7 +25,7 @@ def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
 timeout(time: 120, unit: 'MINUTES') {
   timestamps {
     ansiColor('xterm') {
-      node('linux && immutable') {
+      node(workers.label('s')) {
         catchErrors {
           def VERSION
           def SNAPSHOT_ID

diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es
@@ -21,6 +21,7 @@ def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-d
 
 kibanaPipeline(timeoutMinutes: 120) {
   catchErrors {
+    retryable.enable(2)
     withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
       parallel([
         'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
@@ -61,7 +62,7 @@ kibanaPipeline(timeoutMinutes: 120) {
 }
 
 def promoteSnapshot(snapshotVersion, snapshotId) {
-  node('linux && immutable') {
+  node(workers.label('s')) {
     esSnapshots.promote(snapshotVersion, snapshotId)
   }
 }
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
-/packages/eslint-config-kibana
-/packages/kbn-pm/dist
-/packages/kbn-plugin-generator/sao_template/template
-/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
+/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/**
-/packages/kbn-interpreter/src/common/lib/grammar.js
+/x-pack/legacy/plugins/apm/e2e/cypress/**/snapshots.js
 /x-pack/legacy/plugins/canvas/canvas_plugin
+/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
 /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/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/apm/e2e/cypress/**/snapshots.js
-/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
-**/graphql/types.ts
-**/*.js.snap
-!/.eslintrc.js
+/x-pack/legacy/plugins/maps/public/vendor/**
+
+# package overrides
+/packages/eslint-config-kibana
+/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/
+