Merge branch 'main' into docs__remove-snapshot-restore-docs

.backportrc.json

@@ -1,7 +1,8 @@
 {
   "upstream": "elastic/kibana",
   "targetBranchChoices": [
-    { "name": "master", "checked": true },
+    { "name": "main", "checked": true },
+    "8.0",
     "7.16",
     "7.15",
     "7.14",
@@ -32,7 +33,7 @@
   ],
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
-    "^v8.0.0$": "master",
+    "^v8.1.0$": "main",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,

.bazelrc

@@ -3,12 +3,12 @@
 import %workspace%/.bazelrc.common
 
 # Remote cache settings for local env
-build --remote_cache=grpcs://cloud.buildbuddy.io
-build --incompatible_remote_results_ignore_disk=true
-build --noremote_upload_local_results
-build --remote_timeout=30
-build --remote_header=x-buildbuddy-api-key=3EYk49W2NefOx2n3yMze
-build --remote_accept_cached=true
+# build --remote_cache=grpcs://cloud.buildbuddy.io
+# build --incompatible_remote_results_ignore_disk=true
+# build --noremote_upload_local_results
+# build --remote_timeout=30
+# build --remote_header=x-buildbuddy-api-key=3EYk49W2NefOx2n3yMze
+# build --remote_accept_cached=true
 
 # Enable this in case you want to share your build info
 # build --build_metadata=VISIBILITY=PUBLIC

.buildkite/pipelines/flaky_tests/pipeline.js

@@ -27,6 +27,8 @@ for (let i = 1; i <= XPACK_CI_GROUPS; i++) {
   inputs.push(stepInput(`xpack/cigroup/${i}`, `Default CI Group ${i}`));
 }
 
+inputs.push(stepInput(`xpack/cigroup/Docker`, 'Default CI Group Docker'));
+
 const pipeline = {
   steps: [
     {

.buildkite/pipelines/hourly.yml

@@ -21,7 +21,7 @@ steps:
     agents:
       queue: ci-group-6
     depends_on: build
-    timeout_in_minutes: 150
+    timeout_in_minutes: 250
     key: default-cigroup
     retry:
       automatic:

.buildkite/pipelines/performance/nightly.yml

@@ -24,8 +24,6 @@ steps:
     agents:
       queue: ci-group-6
     depends_on: build
-    concurrency: 50
-    concurrency_group: 'performance-test-group'
 
   - wait: ~
     continue_on_failure: true

.buildkite/scripts/pipelines/pull_request/pipeline.js

@@ -57,6 +57,9 @@ const uploadPipeline = (pipelineContent) => {
     if (
       (await doAnyChangesMatch([
         /^x-pack\/plugins\/security_solution/,
+        /^x-pack\/plugins\/cases/,
+        /^x-pack\/plugins\/lists/,
+        /^x-pack\/plugins\/timelines/,
         /^x-pack\/test\/security_solution_cypress/,
         /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
         /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/context\/actions_connectors_context\.tsx/,
@@ -66,12 +69,12 @@ const uploadPipeline = (pipelineContent) => {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/security_solution.yml'));
     }
 
-    // if (
-    //   (await doAnyChangesMatch([/^x-pack\/plugins\/apm/])) ||
-    //   process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
-    // ) {
-    //   pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
-    // }
+    if (
+      (await doAnyChangesMatch([/^x-pack\/plugins\/apm/])) ||
+      process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
+    ) {
+      pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
+    }
 
     if (await doAnyChangesMatch([/^x-pack\/plugins\/uptime/])) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/uptime.yml'));

.buildkite/scripts/steps/es_snapshots/build.sh

@@ -14,6 +14,10 @@ mkdir -p "$destination"
 mkdir -p elasticsearch && cd elasticsearch
 
 export ELASTICSEARCH_BRANCH="${ELASTICSEARCH_BRANCH:-$BUILDKITE_BRANCH}"
+# Until ES renames their master branch to main...
+if [[ "$ELASTICSEARCH_BRANCH" == "main" ]]; then
+  export ELASTICSEARCH_BRANCH="master"
+fi
 
 if [[ ! -d .git ]]; then
   git init

.buildkite/scripts/steps/functional/apm_cypress.sh

@@ -2,7 +2,10 @@
 
 set -euo pipefail
 
-source .buildkite/scripts/steps/functional/common.sh
+source .buildkite/scripts/common/util.sh
+
+.buildkite/scripts/bootstrap.sh
+.buildkite/scripts/download_build_artifacts.sh
 
 export JOB=kibana-apm-cypress
 
@@ -11,4 +14,5 @@ echo "--- APM Cypress Tests"
 cd "$XPACK_DIR"
 
 checks-reporter-with-killswitch "APM Cypress Tests" \
-  node plugins/apm/scripts/test/e2e.js
+  node plugins/apm/scripts/test/e2e.js \
+  --kibana-install-dir "$KIBANA_BUILD_LOCATION"

.buildkite/scripts/steps/functional/performance.sh

@@ -14,6 +14,8 @@ cat << EOF | buildkite-agent pipeline upload
 steps:
   - command: .buildkite/scripts/steps/functional/performance_sub.sh
     parallelism: "$ITERATION_COUNT"
+    concurrency: 20
+    concurrency_group: 'performance-test-group'
 EOF
 
 

.ci/packer_cache.sh

@@ -7,5 +7,5 @@ if [[ "$(which docker)" != "" && "$(command uname -m)" != "aarch64" ]]; then
   docker pull "maven:3.6.3-openjdk-8-slim"
 fi
 
-./.ci/packer_cache_for_branch.sh master
+./.ci/packer_cache_for_branch.sh main
 ./.ci/packer_cache_for_branch.sh 7.16

.ci/packer_cache_for_branch.sh

@@ -7,7 +7,7 @@ checkoutDir="$(pwd)"
 
 function cleanup()
 {
-  if [[ "$branch" != "master" ]]; then
+  if [[ "$branch" != "main" ]]; then
     rm --preserve-root -rf "$checkoutDir"
   fi
 
@@ -16,7 +16,7 @@ function cleanup()
 
 trap 'cleanup' 0
 
-if [[ "$branch" != "master" ]]; then
+if [[ "$branch" != "main" ]]; then
   checkoutDir="/tmp/kibana-$branch"
   git clone https://github.com/elastic/kibana.git --branch "$branch" --depth 1 "$checkoutDir"
   cd "$checkoutDir"

.github/CODEOWNERS

@@ -95,15 +95,15 @@
 # Observability Shared
 /x-pack/plugins/observability/ @elastic/observability-ui
 
-# Logs and Metrics (Infra)
-/x-pack/plugins/infra/ @elastic/logs-metrics-ui
-/x-pack/plugins/infra/server/routes/log* @elastic/logs-metrics-ui @elastic/logs-ui
-/x-pack/plugins/infra/public/pages/logs/ @elastic/logs-metrics-ui @elastic/logs-ui
-/x-pack/plugins/infra/server/routes/metrics* @elastic/logs-metrics-ui @elastic/metrics-ui
-/x-pack/plugins/infra/public/pages/metrics/ @elastic/logs-metrics-ui @elastic/metrics-ui
+# Infra Monitoring
+/x-pack/plugins/infra/ @elastic/infra-monitoring-ui
+/x-pack/test/functional/apps/infra @elastic/infra-monitoring-ui
+/x-pack/test/api_integration/apis/infra @elastic/infra-monitoring-ui
 
-# Stack Monitoring
-/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui @elastic/logs-metrics-ui @elastic/metrics-ui
+# Elastic Stack Monitoring
+/x-pack/plugins/monitoring/ @elastic/infra-monitoring-ui
+/x-pack/test/functional/apps/monitoring @elastic/infra-monitoring-ui
+/x-pack/test/api_integration/apis/monitoring @elastic/infra-monitoring-ui
 
 # Fleet
 /x-pack/plugins/fleet/ @elastic/fleet
@@ -289,6 +289,7 @@
 /src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
 /src/plugins/interactive_setup/ @elastic/kibana-security
 /test/interactive_setup_api_integration/ @elastic/kibana-security
+/test/interactive_setup_functional/ @elastic/kibana-security
 /x-pack/plugins/spaces/ @elastic/kibana-security
 /x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
 /x-pack/plugins/security/ @elastic/kibana-security

.github/ISSUE_TEMPLATE/v8_breaking_change.md

@@ -37,7 +37,7 @@ changes to Upgrade Assistant itself, please tag Team:Elasticsearch UI.
 
 **Are there any edge cases?**
 
-**[For Kibana deprecations] Can the change be registered with the [Kibana deprecation service](https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md)?**
+**[For Kibana deprecations] Can the change be registered with the [Kibana deprecation service](https://github.com/elastic/kibana/blob/main/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md)?**
 
 <!-- The deprecation service is consumed by the Upgrade Assistant to surface Kibana deprecations.
   It provides a way for Kibana deprecations to be resolved automatically via an API

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,12 +7,12 @@ Summarize your PR. If it involves visual changes include a screenshot or gif.
 
 Delete any items that are not applicable to this PR.
 
-- [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md)
+- [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
 - [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials
 - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
 - [ ] Any UI touched in this PR is usable by keyboard only (learn more about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
 - [ ] Any UI touched in this PR does not create any new axe failures (run axe in browser: [FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/), [Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
-- [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/master/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
+- [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
 - [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
 - [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
 
@@ -30,7 +30,7 @@ When forming the risk matrix, consider some of the following examples and how th
 | Multiple Spaces—unexpected behavior in non-default Kibana Space. | Low | High | Integration tests will verify that all features are still supported in non-default Kibana Space and when user switches between spaces. |
 | Multiple nodes—Elasticsearch polling might have race conditions when multiple Kibana nodes are polling for the same tasks. | High | Low | Tasks are idempotent, so executing them multiple times will not result in logical error, but will degrade performance. To test for this case we add plenty of unit tests around this logic and document manual testing procedure. |
 | Code should gracefully handle cases when feature X or plugin Y are disabled. | Medium | High | Unit tests will verify that any feature flag or plugin combination still results in our service operational. |
-| [See more potential risk examples](https://github.com/elastic/kibana/blob/master/RISK_MATRIX.mdx) |
+| [See more potential risk examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx) |
 
 
 ### For maintainers

.github/stale.yml

@@ -0,0 +1,58 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 180
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: false
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: ["Team:apm"]
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels: ["technical debt", "prevent stale"]
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

.github/workflows/add-to-apm-project.yml

@@ -0,0 +1,28 @@
+name: Add to APM Project
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add_to_project:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        if: |
+          github.event.label.name == 'Team:apm'
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:String!,$contentid:String!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAGc3Zs0VSg"
+          GITHUB_TOKEN: ${{ secrets.APM_TECH_KIBANA_USER_TOKEN }}

.github/workflows/backport.yml

@@ -1,7 +1,7 @@
 on:
   pull_request_target:
     branches:
-      - master
+      - main
     types:
       - labeled
       - closed

.github/workflows/fix-version-gaps.yml

@@ -1,7 +1,7 @@
 on:
   pull_request:
     branches:
-      - master
+      - main
     types:
       - closed
 

STYLEGUIDE.mdx

@@ -210,7 +210,7 @@ less likely to introduce bugs in the future due to insufficient types.
 
 If you’re not having `any` in your plugin or are starting a new plugin, you should enable the
 [`@typescript-eslint/no-explicit-any`](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-explicit-any.md)
-linting rule for your plugin via the [`.eslintrc.js`](https://github.com/elastic/kibana/blob/master/.eslintrc.js) config.
+linting rule for your plugin via the [`.eslintrc.js`](https://github.com/elastic/kibana/blob/main/.eslintrc.js) config.
 
 ### Avoid non-null assertions
 
@@ -229,7 +229,7 @@ assertion would now wrongly disable proper type checking for us.
 
 If you’re not using non-null assertions in your plugin or are starting a new plugin, consider enabling the
 [`@typescript-eslint/no-non-null-assertion`](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-non-null-assertion.md)
-linting rule for you plugin in the [`.eslintrc.js`](https://github.com/elastic/kibana/blob/master/.eslintrc.js) config.
+linting rule for you plugin in the [`.eslintrc.js`](https://github.com/elastic/kibana/blob/main/.eslintrc.js) config.
 
 ### Return/throw early from functions
 

api_docs/cases.json

@@ -7610,10 +7610,10 @@
       },
       {
         "parentPluginId": "cases",
-        "id": "def-common.ConnectorResillientTypeFields",
+        "id": "def-common.ConnectorResilientTypeFields",
         "type": "Type",
         "tags": [],
-        "label": "ConnectorResillientTypeFields",
+        "label": "ConnectorResilientTypeFields",
         "description": [],
         "signature": [
           "{ type: ",