Merge branch 'master' into func-tests/URL-field-formatter

.ci/Jenkinsfile_coverage

@@ -23,18 +23,25 @@ kibanaPipeline(timeoutMinutes: 240) {
 }
 
 def handleIngestion(timestamp) {
+ def previousSha = handlePreviousSha()
  kibanaPipeline.downloadCoverageArtifacts()
  kibanaCoverage.prokLinks("### Process HTML Links")
  kibanaCoverage.collectVcsInfo("### Collect VCS Info")
  kibanaCoverage.generateReports("### Merge coverage reports")
  kibanaCoverage.uploadCombinedReports()
- kibanaCoverage.ingest(timestamp, '### Injest && Upload')
+ kibanaCoverage.ingest(env.JOB_NAME, BUILD_NUMBER, BUILD_URL, timestamp, previousSha, '### Ingest && Upload')
  kibanaCoverage.uploadCoverageStaticSite(timestamp)
 }
 
+def handlePreviousSha() {
+ def previous = kibanaCoverage.downloadPrevious('### Download OLD Previous')
+ kibanaCoverage.uploadPrevious('### Upload NEW Previous')
+ return previous
+}
+
 def handleFail() {
  def buildStatus = buildUtils.getBuildStatus()
- if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED') {
+ if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED' && buildStatus != 'UNSTABLE') {
  slackNotifications.sendFailedBuild(
  channel: '#kibana-qa',
  username: 'Kibana QA'

.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(workers.label('s')) {
+ node(workers.label('l')) {
  catchErrors {
  def VERSION
  def SNAPSHOT_ID
@@ -154,9 +154,10 @@ def buildArchives(destination) {
  "NODE_NAME=",
  ]) {
  sh """
- ./gradlew -p distribution/archives assemble --parallel
+ ./gradlew -Dbuild.docker=true assemble --parallel
  mkdir -p ${destination}
- find distribution/archives -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -exec cp {} ${destination} \\;
+ find distribution -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -not -path *build-context* -exec cp {} ${destination} \\;
+ docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}" | xargs -n1 bash -c 'docker save docker.elastic.co/elasticsearch/elasticsearch:\${0} | gzip > ${destination}/elasticsearch-\${0}-docker-image.tar.gz'
  """
  }
 }

.eslintrc.js

@@ -64,63 +64,63 @@ module.exports = {
  * Temporarily disable some react rules for specific plugins, remove in separate PRs
  */
  {
- files: ['packages/kbn-ui-framework/**/*.{js,ts,tsx}'],
+ files: ['packages/kbn-ui-framework/**/*.{js,mjs,ts,tsx}'],
  rules: {
  'jsx-a11y/no-onchange': 'off',
  },
  },
  {
- files: ['src/plugins/es_ui_shared/**/*.{js,ts,tsx}'],
+ files: ['src/plugins/es_ui_shared/**/*.{js,mjs,ts,tsx}'],
  rules: {
  'react-hooks/exhaustive-deps': 'off',
  },
  },
  {
- files: ['src/plugins/kibana_react/**/*.{js,ts,tsx}'],
+ files: ['src/plugins/kibana_react/**/*.{js,mjs,ts,tsx}'],
  rules: {
  'react-hooks/rules-of-hooks': 'off',
  'react-hooks/exhaustive-deps': 'off',
  },
  },
  {
- files: ['src/plugins/kibana_utils/**/*.{js,ts,tsx}'],
+ files: ['src/plugins/kibana_utils/**/*.{js,mjs,ts,tsx}'],
  rules: {
  'react-hooks/exhaustive-deps': 'off',
  },
  },
  {
- files: ['x-pack/plugins/canvas/**/*.{js,ts,tsx}'],
+ files: ['x-pack/plugins/canvas/**/*.{js,mjs,ts,tsx}'],
  rules: {
  'jsx-a11y/click-events-have-key-events': 'off',
  },
  },
  {
- files: ['x-pack/plugins/cross_cluster_replication/**/*.{js,ts,tsx}'],
+ files: ['x-pack/plugins/cross_cluster_replication/**/*.{js,mjs,ts,tsx}'],
  rules: {
  'jsx-a11y/click-events-have-key-events': 'off',
  },
  },
  {
- files: ['x-pack/legacy/plugins/index_management/**/*.{js,ts,tsx}'],
+ files: ['x-pack/legacy/plugins/index_management/**/*.{js,mjs,ts,tsx}'],
  rules: {
  'react-hooks/exhaustive-deps': 'off',
  'react-hooks/rules-of-hooks': 'off',
  },
  },
  {
- files: ['x-pack/plugins/lens/**/*.{js,ts,tsx}'],
+ files: ['x-pack/plugins/lens/**/*.{js,mjs,ts,tsx}'],
  rules: {
  'react-hooks/exhaustive-deps': 'off',
  },
  },
  {
- files: ['x-pack/plugins/ml/**/*.{js,ts,tsx}'],
+ files: ['x-pack/plugins/ml/**/*.{js,mjs,ts,tsx}'],
  rules: {
  'react-hooks/exhaustive-deps': 'off',
  },
  },
  {
- files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,ts,tsx}'],
+ files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,mjs,ts,tsx}'],
  rules: {
  'react-hooks/exhaustive-deps': 'off',
  },
@@ -132,7 +132,7 @@ module.exports = {
  * Licence headers
  */
  {
- files: ['**/*.{js,ts,tsx}', '!plugins/**/*'],
+ files: ['**/*.{js,mjs,ts,tsx}', '!plugins/**/*'],
  rules: {
  '@kbn/eslint/require-license-header': [
  'error',
@@ -153,7 +153,7 @@ module.exports = {
  * New Platform client-side
  */
  {
- files: ['{src,x-pack}/plugins/*/public/**/*.{js,ts,tsx}'],
+ files: ['{src,x-pack}/plugins/*/public/**/*.{js,mjs,ts,tsx}'],
  rules: {
  'import/no-commonjs': 'error',
  },
@@ -163,7 +163,7 @@ module.exports = {
  * Files that require Elastic license headers instead of Apache 2.0 header
  */
  {
- files: ['x-pack/**/*.{js,ts,tsx}'],
+ files: ['x-pack/**/*.{js,mjs,ts,tsx}'],
  rules: {
  '@kbn/eslint/require-license-header': [
  'error',
@@ -184,7 +184,7 @@ module.exports = {
  * Restricted paths
  */
  {
- files: ['**/*.{js,ts,tsx}'],
+ files: ['**/*.{js,mjs,ts,tsx}'],
  rules: {
  '@kbn/eslint/no-restricted-paths': [
  'error',
@@ -251,8 +251,8 @@ module.exports = {
  ],
  from: [
  '(src|x-pack)/plugins/**/(public|server)/**/*',
- '!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,ts}',
- '!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,ts,tsx}',
+ '!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,mjs,ts}',
+ '!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,mjs,ts,tsx}',
  ],
  allowSameFolder: true,
  errorMessage: 'Plugins may only import from top-level public and server modules.',
@@ -264,11 +264,11 @@ module.exports = {
 
  'src/legacy/core_plugins/**/*',
  '!src/legacy/core_plugins/**/server/**/*',
- '!src/legacy/core_plugins/**/index.{js,ts,tsx}',
+ '!src/legacy/core_plugins/**/index.{js,mjs,ts,tsx}',
 
  'x-pack/legacy/plugins/**/*',
  '!x-pack/legacy/plugins/**/server/**/*',
- '!x-pack/legacy/plugins/**/index.{js,ts,tsx}',
+ '!x-pack/legacy/plugins/**/index.{js,mjs,ts,tsx}',
 
  'examples/**/*',
  '!examples/**/server/**/*',
@@ -334,6 +334,7 @@ module.exports = {
  */
  {
  files: [
+ 'x-pack/test/apm_api_integration/**/*.ts',
  'x-pack/test/functional/apps/**/*.js',
  'x-pack/plugins/apm/**/*.js',
  'test/*/config.ts',
@@ -530,7 +531,7 @@ module.exports = {
  * Jest specific rules
  */
  {
- files: ['**/*.test.{js,ts,tsx}'],
+ files: ['**/*.test.{js,mjs,ts,tsx}'],
  rules: {
  'jest/valid-describe': 'error',
  },
@@ -595,8 +596,8 @@ module.exports = {
  {
  // front end and common typescript and javascript files only
  files: [
- 'x-pack/plugins/security_solution/public/**/*.{js,ts,tsx}',
- 'x-pack/plugins/security_solution/common/**/*.{js,ts,tsx}',
+ 'x-pack/plugins/security_solution/public/**/*.{js,mjs,ts,tsx}',
+ 'x-pack/plugins/security_solution/common/**/*.{js,mjs,ts,tsx}',
  ],
  rules: {
  'import/no-nodejs-modules': 'error',
@@ -646,7 +647,7 @@ module.exports = {
  // {
  // // will introduced after the other warns are fixed
  // // typescript and javascript for front end react performance
- // files: ['x-pack/plugins/security_solution/public/**/!(*.test).{js,ts,tsx}'],
+ // files: ['x-pack/plugins/security_solution/public/**/!(*.test).{js,mjs,ts,tsx}'],
  // plugins: ['react-perf'],
  // rules: {
  // // 'react-perf/jsx-no-new-object-as-prop': 'error',
@@ -657,7 +658,7 @@ module.exports = {
  // },
  {
  // typescript and javascript for front and back end
- files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{js,ts,tsx}'],
+ files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{js,mjs,ts,tsx}'],
  plugins: ['eslint-plugin-node', 'react'],
  env: {
  mocha: true,
@@ -776,8 +777,8 @@ module.exports = {
  {
  // front end and common typescript and javascript files only
  files: [
- 'x-pack/plugins/lists/public/**/*.{js,ts,tsx}',
- 'x-pack/plugins/lists/common/**/*.{js,ts,tsx}',
+ 'x-pack/plugins/lists/public/**/*.{js,mjs,ts,tsx}',
+ 'x-pack/plugins/lists/common/**/*.{js,mjs,ts,tsx}',
  ],
  rules: {
  'import/no-nodejs-modules': 'error',
@@ -792,7 +793,7 @@ module.exports = {
  },
  {
  // typescript and javascript for front and back end
- files: ['x-pack/plugins/lists/**/*.{js,ts,tsx}'],
+ files: ['x-pack/plugins/lists/**/*.{js,mjs,ts,tsx}'],
  plugins: ['eslint-plugin-node'],
  env: {
  mocha: true,
@@ -888,7 +889,7 @@ module.exports = {
  {
  // typescript only for front and back end
  files: [
- 'x-pack/{,legacy/}plugins/{alerting,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
+ 'x-pack/{,legacy/}plugins/{alerts,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
  ],
  rules: {
  '@typescript-eslint/no-explicit-any': 'error',
@@ -1020,8 +1021,8 @@ module.exports = {
  */
  {
  files: [
- 'src/plugins/vis_type_timeseries/**/*.{js,ts,tsx}',
- 'src/legacy/core_plugins/vis_type_timeseries/**/*.{js,ts,tsx}',
+ 'src/plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}',
+ 'src/legacy/core_plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}',
  ],
  rules: {
  'import/no-default-export': 'error',
@@ -1039,5 +1040,22 @@ module.exports = {
  ...require('eslint-config-prettier/@typescript-eslint').rules,
  },
  },
+
+ {
+ files: [
+ // platform-team owned code
+ 'src/core/**',
+ 'x-pack/plugins/features/**',
+ 'x-pack/plugins/licensing/**',
+ 'x-pack/plugins/global_search/**',
+ 'x-pack/plugins/cloud/**',
+ 'packages/kbn-config-schema',
+ 'src/plugins/status_page/**',
+ 'src/plugins/saved_objects_management/**',
+ ],
+ rules: {
+ '@typescript-eslint/prefer-ts-expect-error': 'error',
+ },
+ },
  ],
 };

.fossa.yml

@@ -0,0 +1,15 @@
+# Generated by FOSSA CLI (https://github.com/fossas/fossa-cli)
+# Visit https://fossa.com to learn more
+
+version: 2
+cli:
+ server: https://app.fossa.com
+ fetcher: custom
+ project: kibana
+analyze:
+ modules:
+ - name: kibana
+ type: nodejs
+ strategy: yarn.lock
+ target: .
+ path: .

.github/CODEOWNERS

@@ -84,7 +84,7 @@
 /x-pack/plugins/infra/ @elastic/logs-metrics-ui
 /x-pack/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
-/x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest-management
+/x-pack/plugins/observability/ @elastic/observability-ui
 /x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
@@ -132,6 +132,7 @@
 
 # Quality Assurance
 /src/dev/code_coverage @elastic/kibana-qa
+/vars/*Coverage.groovy @elastic/kibana-qa
 /test/functional/services/common @elastic/kibana-qa
 /test/functional/services/lib @elastic/kibana-qa
 /test/functional/services/remote @elastic/kibana-qa

CONTRIBUTING.md

@@ -436,7 +436,7 @@ We are still to develop a proper process to accept any contributed translations.
 
 When writing a new component, create a sibling SASS file of the same name and import directly into 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).
 
-Any JavaScript (or TypeScript) file that imports SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass) & Kibana invisibles (SASS variables, mixins, functions) from the [`styling_constants.scss` file](https://github.com/elastic/kibana/blob/master/src/legacy/ui/public/styles/_styling_constants.scss). However, any Legacy (file path includes `/legacy`) files will not.
+All SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass) & Kibana invisibles (SASS variables, mixins, functions) from the [`globals_[theme].scss` file](src/legacy/ui/public/styles/_globals_v7light.scss).
 
 **Example:**
 
@@ -679,15 +679,15 @@ Part of this process only applies to maintainers, since it requires access to Gi
 Kibana publishes [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html) for major and minor releases. The Release Notes summarize what the PRs accomplish in language that is meaningful to users. To generate the Release Notes, the team runs a script against this repo to collect the merged PRs against the release.
 
 #### Create the Release Notes text
-The text that appears in the Release Notes is pulled directly from your PR title, or a single paragraph of text that you specify in the PR description. 
+The text that appears in the Release Notes is pulled directly from your PR title, or a single paragraph of text that you specify in the PR description.
 
 To use a single paragraph of text, enter `Release note:` or a `## Release note` header in the PR description, followed by your text. For example, refer to this [PR](https://github.com/elastic/kibana/pull/65796) that uses the `## Release note` header.
 
 When you create the Release Notes text, use the following best practices:
-* Use present tense. 
+* Use present tense.
 * Use sentence case.
 * When you create a feature PR, start with `Adds`.
-* When you create an enhancement PR, start with `Improves`. 
+* When you create an enhancement PR, start with `Improves`.
 * When you create a bug fix PR, start with `Fixes`.
 * When you create a deprecation PR, start with `Deprecates`.
 

docs/api/using-api.asciidoc

@@ -10,7 +10,7 @@ NOTE: The {kib} Console supports only Elasticsearch APIs. You are unable to inte
 [float]
 [[api-authentication]]
 === Authentication
-{kib} supports token-based authentication with the same username and password that you use to log into the {kib} Console.
+{kib} supports token-based authentication with the same username and password that you use to log into the {kib} Console. In a given HTTP tool, and when available, you can select to use its 'Basic Authentication' option, which is where the username and password are stored in order to be passed as part of the call. 
 
 [float]
 [[api-calls]]