Merge branch 'master' into elastic#79984

.backportrc.json

@@ -3,6 +3,8 @@
   "targetBranchChoices": [
     { "name": "master", "checked": true },
     { "name": "7.x", "checked": true },
+    "7.13",
+    "7.12",
     "7.11",
     "7.10",
     "7.9",
@@ -29,7 +31,9 @@
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
     "^v8.0.0$": "master",
-    "^v7.12.0$": "7.x",
+    "^v7.14.0$": "7.x",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
-  }
+  },
+  "autoMerge": true,
+  "autoMergeMethod": "squash"
 }

.bazelignore

@@ -8,7 +8,10 @@
 .idea
 .teamcity
 .yarn-local-mirror
-/bazel
+bazel-bin
+bazel-kibana
+bazel-out
+bazel-testlogs
 build
 node_modules
 target

.bazeliskversion

@@ -1 +1 @@
-1.7.3
+1.7.5

.bazelrc

@@ -2,8 +2,26 @@
 # Import shared settings first so we can override below
 import %workspace%/.bazelrc.common
 
+## Disabled for now
 # Remote cache settings for local env
 # build --remote_cache=https://storage.googleapis.com/kibana-bazel-cache
 # build --incompatible_remote_results_ignore_disk=true
 # build --remote_accept_cached=true
 # build --remote_upload_local_results=false
+
+# BuildBuddy
+## Metadata settings
+build --workspace_status_command="node ./src/dev/bazel_workspace_status.js"
+# Enable this in case you want to share your build info
+# build --build_metadata=VISIBILITY=PUBLIC
+build --build_metadata=TEST_GROUPS=//packages
+
+###############################
+# Offline Support             #
+# Turn on these settings with #
+#  --config=offline           #
+###############################
+
+## Reset remote cache and backend support
+build:offline --bes_backend="" --remote_cache=""
+run:offline --bes_backend="" --remote_cache=""

.bazelrc.common

@@ -7,40 +7,45 @@
 
 # Local Cache Settings
 ## Avoid cache results from being corrupt when changing source during build
-common --experimental_guard_against_concurrent_changes
+build --experimental_guard_against_concurrent_changes
+run --experimental_guard_against_concurrent_changes
+test --experimental_guard_against_concurrent_changes
+query --experimental_guard_against_concurrent_changes
 
 ## Cache action outputs on disk so they persist across output_base and bazel shutdown (eg. changing branches)
-build --disk_cache=~/.bazel-cache/disk-cache
+common --disk_cache=~/.bazel-cache/disk-cache
 
 ## Bazel repo cache settings
-build --repository_cache=~/.bazel-cache/repository-cache
+common --repository_cache=~/.bazel-cache/repository-cache
 
 # Bazel will create symlinks from the workspace directory to output artifacts.
-# Build results will be placed in a directory called "bazel/bin"
+# Build results will be placed in a directory called "bazel-bin"
 # This will still create a bazel-out symlink in
 # the project directory, which must be excluded from the
 # editor's search path.
-build --symlink_prefix=bazel/
 # To disable the symlinks altogether (including bazel-out) we can use
 # build --symlink_prefix=/
 # however this makes it harder to find outputs.
 
 # Prevents the creation of bazel-out dir
-build --experimental_no_product_name_out_symlink
+# build --experimental_no_product_name_out_symlink
 
 # Make direct file system calls to create symlink trees
 build --experimental_inprocess_symlink_creation
 
 # Incompatible flags to run with
 build --incompatible_no_implicit_file_export
 build --incompatible_restrict_string_escapes
+query --incompatible_no_implicit_file_export
+query --incompatible_restrict_string_escapes
 
 # Log configs
 ## different from default
 common --color=yes
-build --show_task_finish
-build --noshow_progress
+common --noshow_progress
+common --show_task_finish
 build --noshow_loading_progress
+query --noshow_loading_progress
 build --show_result=0
 
 # Specifies desired output mode for running tests.
@@ -81,7 +86,7 @@ test:debug --test_output=streamed --test_strategy=exclusive --test_timeout=9999
 run:debug --define=VERBOSE_LOGS=1 -- --node_options=--inspect-brk
 # The following option will change the build output of certain rules such as terser and may not be desirable in all cases
 # It will also output both the repo cache and action cache to a folder inside the repo
-build:debug --compilation_mode=dbg --show_result=1 --disk_cache=bazel/disk-cache --repository_cache=bazel/repository-cache
+build:debug --compilation_mode=dbg --show_result=0 --noshow_loading_progress --noshow_progress --show_task_finish
 
 # Turn off legacy external runfiles
 # This prevents accidentally depending on this feature, which Bazel will remove.

.ci/.storybook/main.js

@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+const config = require('@kbn/storybook').defaultConfig;
+const aliases = require('../../src/dev/storybook/aliases.ts').storybookAliases;
+
+config.refs = {};
+
+for (const alias of Object.keys(aliases).filter((a) => a !== 'ci_composite')) {
+  // snake_case -> Title Case
+  const title = alias
+    .replace(/_/g, ' ')
+    .split(' ')
+    .map((n) => n[0].toUpperCase() + n.slice(1))
+    .join(' ');
+
+  config.refs[alias] = {
+    title: title,
+    url: `${process.env.STORYBOOK_BASE_URL}/${alias}`,
+  };
+}
+
+module.exports = config;

.ci/Dockerfile

@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=14.15.4
+ARG NODE_VERSION=14.16.1
 
 FROM node:${NODE_VERSION} AS base
 

.ci/Jenkinsfile_baseline_capture

@@ -3,30 +3,50 @@
 library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
-kibanaPipeline(timeoutMinutes: 120) {
+kibanaPipeline(timeoutMinutes: 210) {
   githubCommitStatus.trackBuild(params.commit, 'kibana-ci-baseline') {
     ciStats.trackBuild {
-      catchError {
-        withEnv([
-          'CI_PARALLEL_PROCESS_NUMBER=1'
-        ]) {
-          parallel([
-            'oss-baseline': {
-              workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
-                kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
+      catchErrors {
+        slackNotifications.onFailure(
+          title: "*<${env.BUILD_URL}|[${params.branch}] Baseline Capture Failure>*",
+          message: "[${params.branch}/${params.commit}] Baseline Capture Failure",
+        ) {
+          retryable.enable(2)
+
+          catchErrors {
+            workers.ci(
+              name: 'baseline-worker',
+              size: 'xl',
+              ramDisk: true,
+              runErrorReporter: false,
+              bootstrapped: false
+            ) {
+              withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
+                withEnv([
+                  'BUILD_TS_REFS_DISABLE=false', // disabled in root config so we need to override that here
+                  'BUILD_TS_REFS_CACHE_ENABLE=true',
+                  'BUILD_TS_REFS_CACHE_CAPTURE=true',
+                  'DISABLE_BOOTSTRAP_VALIDATION=true',
+                ]) {
+                  kibanaPipeline.doSetup()
+                }
               }
-            },
-            'xpack-baseline': {
-              workers.ci(name: 'xpack-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
-                kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh')()
+
+              kibanaPipeline.withCiTaskQueue([parallel: 2]) {
+                catchErrors {
+                  tasks([
+                    kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh'),
+                    kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh'),
+                    kibanaPipeline.scriptTask('Check Public API Docs', 'test/scripts/checks/plugin_public_api_docs.sh'),
+                  ])
+                }
               }
-            },
-          ])
+            }
+          }
         }
       }
-
-      kibanaPipeline.sendMail()
-      slackNotifications.onFailure()
     }
+
+    kibanaPipeline.sendMail()
   }
 }

.ci/Jenkinsfile_coverage

@@ -3,14 +3,14 @@
 library 'kibana-pipeline-library'
 kibanaLibrary.load() // load from the Jenkins instance
 
-kibanaPipeline(timeoutMinutes: 240) {
+kibanaPipeline(timeoutMinutes: 300) {
   catchErrors {
     def timestamp = new Date(currentBuild.startTimeInMillis).format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone("UTC"))
     withEnv([
       "TIME_STAMP=${timestamp}",
       'CODE_COVERAGE=1', // Enables coverage.  Needed for multiple ci scripts, such as remote.ts, test/scripts/*.sh, schema.js, etc.
     ]) {
-      workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
+      workers.base(name: 'coverage-worker', size: 'xl', ramDisk: false, bootstrapped: false) {
         catchError {
 
           kibanaPipeline.bash("""