Merge remote-tracking branch 'upstream/master' into kbn-88678-clean-p…

…ackagejson

.backportrc.json

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

.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/Jenkinsfile_baseline_capture

@@ -12,7 +12,17 @@ kibanaPipeline(timeoutMinutes: 120) {
         ]) {
           parallel([
             'oss-baseline': {
-              workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
+              workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false, bootstrapped: false) {
+                // bootstrap ourselves, but with the env needed to upload the ts refs cache
+                withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
+                  withEnv([
+                    'BUILD_TS_REFS_CACHE_ENABLE=true',
+                    'BUILD_TS_REFS_CACHE_CAPTURE=true'
+                  ]) {
+                    kibanaPipeline.doSetup()
+                  }
+                }
+
                 kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
               }
             },

.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("""

.ci/Jenkinsfile_flaky

@@ -3,47 +3,39 @@
 library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
-def CI_GROUP_PARAM = params.CI_GROUP
+def TASK_PARAM = params.TASK ?: params.CI_GROUP
 
 // Looks like 'oss:ciGroup:1', 'oss:firefoxSmoke'
-def JOB_PARTS = CI_GROUP_PARAM.split(':')
+def JOB_PARTS = TASK_PARAM.split(':')
 def IS_XPACK = JOB_PARTS[0] == 'xpack'
-def JOB = JOB_PARTS[1]
+def JOB = JOB_PARTS.size() > 1 ? JOB_PARTS[1] : JOB_PARTS[0]
 def CI_GROUP = JOB_PARTS.size() > 2 ? JOB_PARTS[2] : ''
 def EXECUTIONS = params.NUMBER_EXECUTIONS.toInteger()
 def AGENT_COUNT = getAgentCount(EXECUTIONS)
-
-def worker = getWorkerFromParams(IS_XPACK, JOB, CI_GROUP)
-
-def workerFailures = []
+def NEED_BUILD = JOB != 'jestIntegration' && JOB != 'apiIntegration'
 
 currentBuild.displayName += trunc(" ${params.GITHUB_OWNER}:${params.branch_specifier}", 24)
 currentBuild.description = "${params.CI_GROUP}<br />Agents: ${AGENT_COUNT}<br />Executions: ${params.NUMBER_EXECUTIONS}"
 
 kibanaPipeline(timeoutMinutes: 180) {
   def agents = [:]
+  def workerFailures = []
+
+  def worker = getWorkerFromParams(IS_XPACK, JOB, CI_GROUP)
+
   for(def agentNumber = 1; agentNumber <= AGENT_COUNT; agentNumber++) {
-    def agentNumberInside = agentNumber
     def agentExecutions = floor(EXECUTIONS/AGENT_COUNT) + (agentNumber <= EXECUTIONS%AGENT_COUNT ? 1 : 0)
+
     agents["agent-${agentNumber}"] = {
-      catchErrors {
-        print "Agent ${agentNumberInside} - ${agentExecutions} executions"
-
-        withEnv([
-          'IGNORE_SHIP_CI_STATS_ERROR=true',
-        ]) {
-          workers.functional('flaky-test-runner', {
-            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))()
-        }
-      }
+      agentProcess(
+        agentNumber: agentNumber,
+        agentExecutions: agentExecutions,
+        worker: worker,
+        workerFailures: workerFailures,
+        needBuild: NEED_BUILD,
+        isXpack: IS_XPACK,
+        ciGroup: CI_GROUP
+      )
     }
   }
 
@@ -59,14 +51,70 @@ kibanaPipeline(timeoutMinutes: 180) {
   }
 }
 
+def agentProcess(Map params = [:]) {
+  def config = [
+    agentNumber: 1,
+    agentExecutions: 0,
+    worker: {},
+    workerFailures: [],
+    needBuild: false,
+    isXpack: false,
+    ciGroup: null,
+  ] + params
+
+  catchErrors {
+    print "Agent ${config.agentNumber} - ${config.agentExecutions} executions"
+
+    withEnv([
+      'IGNORE_SHIP_CI_STATS_ERROR=true',
+    ]) {
+      kibanaPipeline.withTasks([
+        parallel: 20,
+      ]) {
+        task {
+          if (config.needBuild) {
+            if (!config.isXpack) {
+              kibanaPipeline.buildOss()
+            } else {
+              kibanaPipeline.buildXpack()
+            }
+          }
+
+          for(def i = 0; i < config.agentExecutions; i++) {
+            def taskNumber = i
+            task({
+              withEnv([
+                "REMOVE_KIBANA_INSTALL_DIR=1",
+              ]) {
+                catchErrors {
+                  try {
+                    config.worker()
+                  } catch (ex) {
+                    config.workerFailures << "agent-${config.agentNumber}-${taskNumber}"
+                    throw ex
+                  }
+                }
+              }
+            })
+          }
+        }
+      }
+    }
+  }
+}
+
 def getWorkerFromParams(isXpack, job, ciGroup) {
   if (!isXpack) {
     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')
-    } else if(job == 'visualRegression') {
+    } else if (job == 'visualRegression') {
       return kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh')
+    } else if (job == 'jestIntegration') {
+      return kibanaPipeline.scriptTaskDocker('Jest Integration Tests', 'test/scripts/test/jest_integration.sh')
+    } else if (job == 'apiIntegration') {
+      return kibanaPipeline.scriptTask('API Integration Tests', 'test/scripts/test/api_integration.sh')
     } else {
       return kibanaPipeline.ossCiGroupProcess(ciGroup)
     }
@@ -76,45 +124,16 @@ def getWorkerFromParams(isXpack, job, ciGroup) {
     return kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh')
   } else if (job == 'firefoxSmoke') {
     return kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh')
-  } else if(job == 'visualRegression') {
+  } else if (job == 'visualRegression') {
     return kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')
   } else {
     return kibanaPipeline.xpackCiGroupProcess(ciGroup)
   }
 }
 
-def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWorkerProcesses = 12) {
-  def workerMap = [:]
-  def numberOfWorkers = Math.min(numberOfExecutions, maxWorkerProcesses)
-
-  for(def i = 1; i <= numberOfWorkers; i++) {
-    def workerExecutions = floor(numberOfExecutions/numberOfWorkers + (i <= numberOfExecutions%numberOfWorkers ? 1 : 0))
-
-    workerMap["agent-${agentNumber}-worker-${i}"] = { workerNumber ->
-      for(def j = 0; j < workerExecutions; j++) {
-        print "Execute agent-${agentNumber} worker-${workerNumber}: ${j}"
-        withEnv([
-          "REMOVE_KIBANA_INSTALL_DIR=1",
-        ]) {
-          catchErrors {
-            try {
-              worker(workerNumber)
-            } catch (ex) {
-              workerFailures << "agent-${agentNumber} worker-${workerNumber}-${j}"
-              throw ex
-            }
-          }
-        }
-      }
-    }
-  }
-
-  return workerMap
-}
-
 def getAgentCount(executions) {
-  // Increase agent count every 24 worker processess, up to 3 agents maximum
-  return Math.min(3, 1 + floor(executions/24))
+  // Increase agent count every 20 worker processess, up to 3 agents maximum
+  return Math.min(3, 1 + floor(executions/20))
 }
 
 def trunc(str, length) {

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -19,7 +19,7 @@ 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: 150) {
+kibanaPipeline(timeoutMinutes: 210) {
   catchErrors {
     slackNotifications.onFailure(
       title: "*<${env.BUILD_URL}|[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure>*",

.eslintignore

@@ -15,6 +15,7 @@ node_modules
 target
 snapshots.js
 
+!/.ci
 !/.eslintrc.js
 !.storybook
 

.github/CODEOWNERS

@@ -74,7 +74,13 @@
 #CC# /src/plugins/apm_oss/ @elastic/apm-ui
 #CC# /x-pack/plugins/observability/ @elastic/apm-ui
 
-# Client Side Monitoring (lives in APM directories but owned by Uptime)
+# Uptime
+/x-pack/plugins/uptime @elastic/uptime
+/x-pack/test/functional_with_es_ssl/apps/uptime  @elastic/uptime
+/x-pack/test/functional/apps/uptime @elastic/uptime
+/x-pack/test/api_integration/apis/uptime @elastic/uptime
+
+# Client Side Monitoring / Uptime (lives in APM directories but owned by Uptime)
 /x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm @elastic/uptime
 /x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature @elastic/uptime
 /x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
@@ -106,7 +112,6 @@
 /x-pack/plugins/fleet/ @elastic/fleet
 /x-pack/plugins/observability/ @elastic/observability-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
-/x-pack/plugins/uptime @elastic/uptime
 
 # Machine Learning
 /x-pack/plugins/ml/  @elastic/ml-ui
@@ -246,6 +251,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/ @elastic/kibana-core @elastic/
 /x-pack/test/security_api_integration/ @elastic/kibana-security
 /x-pack/test/security_functional/ @elastic/kibana-security
 /x-pack/test/spaces_api_integration/ @elastic/kibana-security
+/x-pack/test/saved_object_api_integration/ @elastic/kibana-security
 #CC# /x-pack/plugins/security/ @elastic/kibana-security
 
 # Kibana Alerting Services

.github/workflows/backport.yml

@@ -18,34 +18,20 @@ jobs:
       )
     runs-on: ubuntu-latest
     steps:
-      - name: 'Get backport config'
-        run: |
-          curl 'https://raw.githubusercontent.com/elastic/kibana/master/.backportrc.json' > .backportrc.json
-
-      - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
+      - name: Checkout Actions
+        uses: actions/checkout@v2
         with:
-          node-version: 14.x
-
-      - name: Install backport CLI
-        run: npm install -g [email protected]
+          repository: 'elastic/kibana-github-actions'
+          ref: main
+          path: ./actions
 
-      - name: Backport PR
-        run: |
-          git config --global user.name "kibanamachine"
-          git config --global user.email "[email protected]"
-          backport --fork true --username kibanamachine --accessToken "${{ secrets.KIBANAMACHINE_TOKEN }}" --ci --pr "$PR_NUMBER" --labels backport --assignee "$PR_OWNER" | tee 'output.log'
-        env:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          PR_OWNER: ${{ github.event.pull_request.user.login }}
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
 
-      - name: Report backport status
-        run: |
-          COMMENT="Backport result
-          \`\`\`
-          $(cat output.log)
-          \`\`\`"
-
-          GITHUB_TOKEN="${{ secrets.KIBANAMACHINE_TOKEN }}" gh api -X POST repos/elastic/kibana/issues/$PR_NUMBER/comments -F body="$COMMENT"
-        env:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
+      - name: Run Backport
+        uses: ./actions/backport
+        with:
+          branch: master
+          github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
+          commit_user: kibanamachine
+          commit_email: [email protected]

.gitignore

@@ -61,9 +61,6 @@ npm-debug.log*
 .ci/bash_standard_lib.sh
 .gradle
 
-# apm plugin
-/x-pack/plugins/apm/tsconfig.json
-apm.tsconfig.json
 ## @cypress/snapshot from apm plugin
 snapshots.js
 

.i18nrc.json

@@ -29,6 +29,7 @@
     "maps_legacy": "src/plugins/maps_legacy",
     "monaco": "packages/kbn-monaco/src",
     "presentationUtil": "src/plugins/presentation_util",
+    "indexPatternFieldEditor": "src/plugins/index_pattern_field_editor",
     "indexPatternManagement": "src/plugins/index_pattern_management",
     "advancedSettings": "src/plugins/advanced_settings",
     "kibana_legacy": "src/plugins/kibana_legacy",

Jenkinsfile

@@ -3,7 +3,7 @@
 library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
-kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true) {
+kibanaPipeline(timeoutMinutes: 210, checkPrChanges: true, setCommitStatus: true) {
   slackNotifications.onFailure(disabled: !params.NOTIFY_ON_FAILURE) {
     githubPr.withDefaultPrComments {
       ciStats.trackBuild {