Merge branch 'master' of github.com:elastic/kibana into ilm/add-shrin…

…k-field-to-hot-phase

* 'master' of github.com:elastic/kibana: (429 commits)
  simplify popover open state logic (elastic#85379)
  [Logs UI][Metrics UI] Move actions to the kibana header (elastic#84648)
  [Search Source] Do not pick scripted fields if * provided (elastic#85133)
  [Search] Session SO polling (elastic#84225)
  [Transform] Replace legacy elasticsearch client (elastic#84932)
  [Uptime]Refactor header and action menu (elastic#83779)
  Fix agg select external link (elastic#85380)
  [ILM] Show forcemerge in hot when rollover is searchable snapshot is enabled (elastic#85292)
  clear using keyboard (elastic#85042)
  [GS] add tag and dashboard suggestion results (elastic#85144)
  [ML] API integration tests - skip GetAnomaliesTableData
  Add ECS field for event.code. (elastic#85109)
  [Functional][TSVB] Wait for markdown textarea to be cleaned (elastic#85128)
  skip flaky suite (elastic#62060)
  skip flaky suite (elastic#85098)
  Bump highlight.js to v9.18.5 (elastic#84296)
  Add `server.publicBaseUrl` config (elastic#85075)
  [Alerting & Actions ] More debug logging (elastic#85149)
  [Security Solution][Case] Manual attach alert to a case (elastic#82996)
  Loosen UUID regex to accept uuidv1 or uuidv4 (elastic#85338)
  ...

# Conflicts:
#	x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index.ts
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/i18n_texts.ts
#	x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts

.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=12.19.1
+ARG NODE_VERSION=14.15.1
 
 FROM node:${NODE_VERSION} AS base
 

.ci/build_docker.sh

@@ -7,4 +7,8 @@ cd "$(dirname "${0}")"
 cp /usr/local/bin/runbld ./
 cp /usr/local/bin/bash_standard_lib.sh ./
 
-docker build -t kibana-ci -f ./Dockerfile .
+if which docker >/dev/null; then
+ docker build -t kibana-ci -f ./Dockerfile .
+else
+ echo "Docker binary is not available. Skipping the docker build this time."
+fi

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -55,6 +55,7 @@ kibanaPipeline(timeoutMinutes: 150) {
  'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
  'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
  'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
+ 'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
  ]),
  ])
  }

.ci/jobs.yml

@@ -31,6 +31,7 @@ JOB:
  - x-pack-ciGroup8
  - x-pack-ciGroup9
  - x-pack-ciGroup10
+ - x-pack-ciGroup11
  - x-pack-accessibility
  - x-pack-visualRegression
 

.ci/packer_cache_for_branch.sh

@@ -49,7 +49,8 @@ tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
  .chromium \
  .es \
  .chromedriver \
- .geckodriver;
+ .geckodriver \
+ .yarn-local-mirror;
 
 echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
 

.eslintignore

@@ -44,3 +44,4 @@ snapshots.js
 /packages/kbn-ui-framework/doc_site/build
 /packages/kbn-ui-framework/generator-kui/*/templates/
 /packages/kbn-ui-shared-deps/flot_charts
+/packages/kbn-monaco/src/painless/antlr

.github/CODEOWNERS

@@ -69,7 +69,8 @@
 /x-pack/plugins/apm/ @elastic/apm-ui
 /x-pack/test/functional/apps/apm/ @elastic/apm-ui
 /src/plugins/apm_oss/ @elastic/apm-ui
-/src/apm.js @watson @vigneshshanmugam
+/src/apm.js @elastic/kibana-core @vigneshshanmugam
+/packages/kbn-apm-config-loader/ @elastic/kibana-core @vigneshshanmugam
 #CC# /src/plugins/apm_oss/ @elastic/apm-ui
 #CC# /x-pack/plugins/observability/ @elastic/apm-ui
 
@@ -132,7 +133,7 @@
 /x-pack/test/functional_basic/apps/transform/ @elastic/ml-ui
 
 # Maps
-/x-pack/plugins/maps/ @elastic/kibana-gis
+#CC# /x-pack/plugins/maps/ @elastic/kibana-gis
 /x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
 /x-pack/test/functional/apps/maps/ @elastic/kibana-gis
 /x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
@@ -141,9 +142,8 @@
 #CC# /src/plugins/maps_oss/ @elastic/kibana-gis
 #CC# /x-pack/plugins/file_upload @elastic/kibana-gis
 #CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
-#CC# /src/plugins/home/server/tutorials @elastic/kibana-gis
-#CC# /src/plugins/tile_map/ @elastic/kibana-gis
-#CC# /src/plugins/region_map/ @elastic/kibana-gis
+/src/plugins/tile_map/ @elastic/kibana-gis
+/src/plugins/region_map/ @elastic/kibana-gis
 
 # Operations
 /src/dev/ @elastic/kibana-operations
@@ -187,6 +187,9 @@
 /x-pack/test/saved_object_tagging/ @elastic/kibana-core
 /packages/kbn-config-schema/ @elastic/kibana-core
 /packages/kbn-std/ @elastic/kibana-core
+/packages/kbn-config/ @elastic/kibana-core
+/packages/kbn-logging/ @elastic/kibana-core
+/packages/kbn-legacy-logging/ @elastic/kibana-core
 /src/legacy/server/config/ @elastic/kibana-core
 /src/legacy/server/http/ @elastic/kibana-core
 /src/legacy/server/logging/ @elastic/kibana-core
@@ -204,6 +207,28 @@
 #CC# /x-pack/plugins/features/ @elastic/kibana-core
 #CC# /x-pack/plugins/global_search/ @elastic/kibana-core
 
+# Kibana Telemetry
+/packages/kbn-analytics/ @elastic/kibana-core
+/packages/kbn-telemetry-tools/ @elastic/kibana-core
+/src/plugins/kibana_usage_collection/ @elastic/kibana-core
+/src/plugins/newsfeed/ @elastic/kibana-core
+/src/plugins/telemetry/ @elastic/kibana-core
+/src/plugins/telemetry_collection_manager/ @elastic/kibana-core
+/src/plugins/telemetry_management_section/ @elastic/kibana-core
+/src/plugins/usage_collection/ @elastic/kibana-core
+/x-pack/plugins/telemetry_collection_xpack/ @elastic/kibana-core
+/.telemetryrc.json @elastic/kibana-core
+/x-pack/.telemetryrc.json @elastic/kibana-core
+src/plugins/telemetry/schema/legacy_oss_plugins.json @elastic/kibana-core
+src/plugins/telemetry/schema/oss_plugins.json @elastic/kibana-core
+x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kibana-core
+
+# Kibana Localization
+/src/dev/i18n/ @elastic/kibana-localization @elastic/kibana-core
+/src/core/public/i18n/ @elastic/kibana-localization @elastic/kibana-core
+/packages/kbn-i18n/ @elastic/kibana-localization @elastic/kibana-core
+#CC# /x-pack/plugins/translations/ @elastic/kibana-localization @elastic/kibana-core
+
 # Security
 /src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
 /src/plugins/security_oss/ @elastic/kibana-security
@@ -221,28 +246,6 @@
 #CC# /x-pack/plugins/security_solution/ @elastic/kibana-security
 #CC# /x-pack/plugins/security/ @elastic/kibana-security
 
-# Kibana Localization
-/src/dev/i18n/ @elastic/kibana-localization
-/src/core/public/i18n/ @elastic/kibana-localization
-/packages/kbn-i18n/ @elastic/kibana-localization
-#CC# /x-pack/plugins/translations/ @elastic/kibana-localization
-
-# Kibana Telemetry
-/packages/kbn-analytics/ @elastic/kibana-telemetry
-/packages/kbn-telemetry-tools/ @elastic/kibana-telemetry
-/src/plugins/kibana_usage_collection/ @elastic/kibana-telemetry
-/src/plugins/newsfeed/ @elastic/kibana-telemetry
-/src/plugins/telemetry/ @elastic/kibana-telemetry
-/src/plugins/telemetry_collection_manager/ @elastic/kibana-telemetry
-/src/plugins/telemetry_management_section/ @elastic/kibana-telemetry
-/src/plugins/usage_collection/ @elastic/kibana-telemetry
-/x-pack/plugins/telemetry_collection_xpack/ @elastic/kibana-telemetry
-/.telemetryrc.json @elastic/kibana-telemetry
-/x-pack/.telemetryrc.json @elastic/kibana-telemetry
-src/plugins/telemetry/schema/legacy_oss_plugins.json @elastic/kibana-telemetry
-src/plugins/telemetry/schema/oss_plugins.json @elastic/kibana-telemetry
-x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kibana-telemetry
-
 # Kibana Alerting Services
 /x-pack/plugins/alerts/ @elastic/kibana-alerting-services
 /x-pack/plugins/actions/ @elastic/kibana-alerting-services
@@ -259,8 +262,31 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 
 # Enterprise Search
 # Shared
-/x-pack/plugins/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/* @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/common/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/* @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/applications/* @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/applications/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/applications/shared/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/applications/__mocks__/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/* @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/lib/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/__mocks__/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/lib/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/ @elastic/enterprise-search-frontend
 /x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
+# App Search
+/x-pack/plugins/enterprise_search/public/applications/app_search/ @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/app_search/ @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/app_search/ @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/app_search/ @elastic/app-search-frontend
+# Workplace Search
+/x-pack/plugins/enterprise_search/public/applications/workplace_search/ @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/workplace_search/ @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/workplace_search/ @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/ @elastic/workplace-search-frontend
 
 # Elasticsearch UI
 /src/plugins/dev_tools/ @elastic/es-ui

.gitignore

@@ -75,3 +75,6 @@ report.asciidoc
 
 # TS incremental build cache
 *.tsbuildinfo
+
+# Yarn local mirror content
+.yarn-local-mirror

.i18nrc.json

@@ -27,6 +27,8 @@
  "src/plugins/management"
  ],
  "maps_legacy": "src/plugins/maps_legacy",
+ "monaco": "packages/kbn-monaco/src",
+ "presentationUtil": "src/plugins/presentation_util",
  "indexPatternManagement": "src/plugins/index_pattern_management",
  "advancedSettings": "src/plugins/advanced_settings",
  "kibana_legacy": "src/plugins/kibana_legacy",

.node-version

@@ -1 +1 @@
-12.19.1
+14.15.1

.nvmrc

@@ -1 +1 @@
-12.19.1
+14.15.1

.teamcity/src/builds/test/QuickTests.kt

@@ -13,8 +13,6 @@ object QuickTests : BuildType({
 
  val testScripts = mapOf(
  "Test Hardening" to ".ci/teamcity/tests/test_hardening.sh",
- "X-Pack List cyclic dependency" to ".ci/teamcity/tests/xpack_list_cyclic_dependency.sh",
- "X-Pack SIEM cyclic dependency" to ".ci/teamcity/tests/xpack_siem_cyclic_dependency.sh",
  "Test Projects" to ".ci/teamcity/tests/test_projects.sh",
  "Mocha Tests" to ".ci/teamcity/tests/mocha.sh"
  )

.yarnrc

@@ -0,0 +1,5 @@
+# Configure an offline yarn mirror in the data folder
+yarn-offline-mirror ".yarn-local-mirror"
+
+# Always look into the cache first before fetching online
+--install.prefer-offline true

README.md

@@ -13,7 +13,7 @@ Kibana is your window into the [Elastic Stack](https://www.elastic.co/products).
 
 If you just want to try Kibana out, check out the [Elastic Stack Getting Started Page](https://www.elastic.co/start) to give it a whirl.
 
-If you're interested in diving a bit deeper and getting a taste of Kibana's capabilities, head over to the [Kibana Getting Started Page](https://www.elastic.co/guide/en/kibana/current/getting-started.html).
+If you're interested in diving a bit deeper and getting a taste of Kibana's capabilities, head over to the [Kibana Getting Started Page](https://www.elastic.co/guide/en/kibana/current/get-started.html).
 
 ### Using a Kibana Release
 

STYLEGUIDE.md

@@ -589,6 +589,24 @@ Do not use setters, they cause more problems than they can solve.
 
 [sideeffect]: http://en.wikipedia.org/wiki/Side_effect_(computer_science)
 
+### Avoid circular dependencies
+
+As part of a future effort to use correct and idempotent build tools we need our code to be
+able to be represented as a directed acyclic graph. We must avoid having circular dependencies 
+both on code and type imports to achieve that. One of the most critical parts is the plugins 
+code. We've developed a tool to identify plugins with circular dependencies which 
+has allowed us to build a list of plugins who have circular dependencies 
+between each other. 
+
+When building plugins we should avoid importing from plugins 
+who are known to have circular dependencies at the moment as well as introducing 
+new circular dependencies. You can run the same tool we use on our CI locally by 
+typing `node scripts/find_plugins_with_circular_deps --debug`. It will error out in 
+case new circular dependencies has been added with your changes 
+(which will also happen in the CI) as well as print out the current list of
+the known circular dependencies which, as mentioned before, should not be imported 
+by your code until the circular dependencies on these have been solved. 
+
 ## SASS files
 
 When writing a new component, create a sibling SASS file of the same name and import directly into the **top** of the JS/TS component file. Doing so ensures the styles are never separated or lost on import and allows for better modularization (smaller individual plugin asset footprint).

config/kibana.yml

@@ -18,6 +18,10 @@
 # default to `true` starting in Kibana 7.0.
 #server.rewriteBasePath: false
 
+# Specifies the public URL at which Kibana is available for end users. If
+# `server.basePath` is configured this URL should end with the same basePath.
+#server.publicBaseUrl: ""
+
 # The maximum payload size in bytes for incoming server requests.
 #server.maxPayloadBytes: 1048576
 

docs/api/logstash-configuration-management/create-logstash.asciidoc

@@ -20,9 +20,6 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
 [[logstash-configuration-management-api-create-request-body]]
 ==== Request body
 
-`id`::
- (Required, string) The pipeline ID.
-
 `description`::
  (Optional, string) The pipeline description.
 

docs/api/saved-objects/create.asciidoc

@@ -9,11 +9,13 @@ experimental[] Create {kib} saved objects.
 [[saved-objects-api-create-request]]
 ==== Request
 
-`POST <kibana host>:<port>/api/saved_objects/<type>` +
+`POST <kibana host>:<port>/api/saved_objects/<type>`
 
 `POST <kibana host>:<port>/api/saved_objects/<type>/<id>`
 
-`POST <kibana host>:<port>/s/<space_id>/saved_objects/<type>`
+`POST <kibana host>:<port>/s/<space_id>/api/saved_objects/<type>`
+
+`POST <kibana host>:<port>/s/<space_id>/api/saved_objects/<type>/<id>`
 
 [[saved-objects-api-create-path-params]]
 ==== Path parameters

docs/api/spaces-management/copy_saved_objects.asciidoc

@@ -51,9 +51,17 @@ You can request to overwrite any objects that already exist in the target space
  (Optional, boolean) When set to `true`, all saved objects related to the specified saved objects will also be copied into the target
  spaces. The default value is `false`.
 
+`createNewCopies`::
+ (Optional, boolean) Creates new copies of saved objects, regenerates each object ID, and resets the origin. When used, potential conflict
+ errors are avoided. The default value is `true`.
++
+NOTE: This cannot be used with the `overwrite` option.
+
 `overwrite`::
  (Optional, boolean) When set to `true`, all conflicts are automatically overidden. When a saved object with a matching `type` and `id`
  exists in the target space, that version is replaced with the version from the source space. The default value is `false`.
++
+NOTE: This cannot be used with the `createNewCopies` option.
 
 [role="child_attributes"]
 [[spaces-api-copy-saved-objects-response-body]]
@@ -128,8 +136,7 @@ $ curl -X POST api/spaces/_copy_saved_objects
  "id": "my-dashboard"
  }],
  "spaces": ["marketing"],
- "includeReferences": true,
- "createNewcopies": true
+ "includeReferences": true
 }
 ----
 // KIBANA
@@ -193,7 +200,8 @@ $ curl -X POST api/spaces/_copy_saved_objects
  "id": "my-dashboard"
  }],
  "spaces": ["marketing"],
- "includeReferences": true
+ "includeReferences": true,
+ "createNewCopies": false
 }
 ----
 // KIBANA
@@ -254,7 +262,8 @@ $ curl -X POST api/spaces/_copy_saved_objects
  "id": "my-dashboard"
  }],
  "spaces": ["marketing", "sales"],
- "includeReferences": true
+ "includeReferences": true,
+ "createNewCopies": false
 }
 ----
 // KIBANA
@@ -405,7 +414,8 @@ $ curl -X POST api/spaces/_copy_saved_objects
  "id": "my-dashboard"
  }],
  "spaces": ["marketing"],
- "includeReferences": true
+ "includeReferences": true,
+ "createNewCopies": false
 }
 ----
 // KIBANA

docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc

@@ -45,6 +45,10 @@ Execute the <<spaces-api-copy-saved-objects,copy saved objects to space API>>, w
 `includeReferences`::
  (Optional, boolean) When set to `true`, all saved objects related to the specified saved objects are copied into the target spaces. The `includeReferences` must be the same values used during the failed <<spaces-api-copy-saved-objects, copy saved objects to space API>> operation. The default value is `false`.
 
+`createNewCopies`::
+ (Optional, boolean) Creates new copies of the saved objects, regenerates each object ID, and resets the origin. When enabled during the
+ initial copy, also enable when resolving copy errors. The default value is `true`.
+
 `retries`::
  (Required, object) The retry operations to attempt, which can specify how to resolve different types of errors. Object keys represent the
  target space IDs.
@@ -148,6 +152,7 @@ $ curl -X POST api/spaces/_resolve_copy_saved_objects_errors
  "id": "my-dashboard"
  }],
  "includeReferences": true,
+ "createNewCopies": false,
  "retries": {
  "sales": [
  {
@@ -246,6 +251,7 @@ $ curl -X POST api/spaces/_resolve_copy_saved_objects_errors
  "id": "my-dashboard"
  }],
  "includeReferences": true,
+ "createNewCopies": false,
  "retries": {
  "marketing": [
  {