Merge remote-tracking branch 'elastic/master' into monitoring/multipl…

…e_alerts

.ci/Jenkinsfile_baseline_capture

@@ -4,23 +4,25 @@ library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
 kibanaPipeline(timeoutMinutes: 120) {
-  ciStats.trackBuild {
-    catchError {
-      parallel([
-        'oss-visualRegression': {
-          workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
-            kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
-          }
-        },
-        'xpack-visualRegression': {
-          workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
-            kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
-          }
-        },
-      ])
-    }
+  githubCommitStatus.trackBuild(params.commit, 'kibana-ci-baseline') {
+    ciStats.trackBuild {
+      catchError {
+        parallel([
+          'oss-visualRegression': {
+            workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
+              kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
+            }
+          },
+          'xpack-visualRegression': {
+            workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
+              kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
+            }
+          },
+        ])
+      }
 
-    kibanaPipeline.sendMail()
-    slackNotifications.onFailure()
+      kibanaPipeline.sendMail()
+      slackNotifications.onFailure()
+    }
   }
 }

.ci/Jenkinsfile_baseline_trigger

@@ -16,6 +16,12 @@ kibanaLibrary.load()
 
 withGithubCredentials {
   branches.each { branch ->
+    if (branch == '6.8') {
+      // skip 6.8, it is tracked but we don't need snapshots for it and haven't backported
+      // the baseline capture scripts to it.
+      return;
+    }
+
     stage(branch) {
       def commits = getCommits(branch, MAXIMUM_COMMITS_TO_CHECK, MAXIMUM_COMMITS_TO_BUILD)
 

.ci/end2end.groovy

@@ -110,6 +110,9 @@ pipeline {
         archiveArtifacts(allowEmptyArchive: true, artifacts: "${E2E_DIR}/kibana.log")
       }
     }
+    cleanup {
+      notifyBuildResult(prComment: false, analyzeFlakey: false, shouldNotify: false)
+    }
   }
 }
 

.ci/pipeline-library/src/test/githubCommitStatus.groovy

@@ -12,6 +12,7 @@ class GithubCommitStatusTest extends KibanaBasePipelineTest {
 
   interface BuildState {
     Object get(String key)
+    Object has(String key)
   }
 
   interface GithubApi {
@@ -25,6 +26,7 @@ class GithubCommitStatusTest extends KibanaBasePipelineTest {
     buildStateMock = mock(BuildState)
     githubApiMock = mock(GithubApi)
 
+    when(buildStateMock.has('checkoutInfo')).thenReturn(true)
     when(buildStateMock.get('checkoutInfo')).thenReturn([ commit: 'COMMIT_HASH', ])
     when(githubApiMock.post(any(), any())).thenReturn(null)
 

.eslintignore

@@ -33,7 +33,7 @@ target
 /x-pack/plugins/canvas/canvas_plugin
 /x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
 /x-pack/plugins/canvas/shareable_runtime/build
-/x-pack/plugins/canvas/storybook
+/x-pack/plugins/canvas/storybook/build
 /x-pack/plugins/monitoring/public/lib/jquery_flot
 /x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
 /x-pack/legacy/plugins/infra/common/graphql/types.ts

.eslintrc.js

@@ -1222,6 +1222,12 @@ module.exports = {
         ],
       },
     },
+    {
+      files: ['x-pack/plugins/canvas/storybook/**'],
+      rules: {
+        'import/no-extraneous-dependencies': 0,
+      },
+    },
     {
       files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*.js'],
       globals: { canvas: true, $: true },

.github/CODEOWNERS

@@ -115,7 +115,6 @@
 /src/dev/ @elastic/kibana-operations
 /src/setup_node_env/ @elastic/kibana-operations
 /src/optimize/ @elastic/kibana-operations
-/src/es_archiver/ @elastic/kibana-operations
 /packages/*eslint*/ @elastic/kibana-operations
 /packages/*babel*/ @elastic/kibana-operations
 /packages/kbn-dev-utils*/ @elastic/kibana-operations
@@ -124,6 +123,7 @@
 /packages/kbn-pm/ @elastic/kibana-operations
 /packages/kbn-test/ @elastic/kibana-operations
 /packages/kbn-ui-shared-deps/ @elastic/kibana-operations
+/packages/kbn-es-archiver/ @elastic/kibana-operations
 /src/legacy/server/keystore/ @elastic/kibana-operations
 /src/legacy/server/pid/ @elastic/kibana-operations
 /src/legacy/server/sass/ @elastic/kibana-operations

.sass-lint.yml

@@ -3,6 +3,7 @@ files:
     - 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
     - 'src/plugins/timelion/**/*.s+(a|c)ss'
     - 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
+    - 'src/plugins/vis_type_vega/**/*.s+(a|c)ss'
     - 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
     - 'x-pack/plugins/canvas/**/*.s+(a|c)ss'
     - 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'

docs/development/core/server/kibana-plugin-core-server.httpservicesetup.registeronpostauth.md

@@ -14,5 +14,5 @@ registerOnPostAuth: (handler: OnPostAuthHandler) => void;
 
 ## Remarks
 
-The auth state is available at stage via http.auth.get(..) Can register any number of registerOnPreRouting, which are called in sequence (from the first registered to the last). See [OnPostAuthHandler](./kibana-plugin-core-server.onpostauthhandler.md)<!-- -->.
+The auth state is available at stage via http.auth.get(..) Can register any number of registerOnPostAuth, which are called in sequence (from the first registered to the last). See [OnPostAuthHandler](./kibana-plugin-core-server.onpostauthhandler.md)<!-- -->.
 

docs/development/core/server/kibana-plugin-core-server.httpservicesetup.registeronpreauth.md

@@ -14,5 +14,5 @@ registerOnPreAuth: (handler: OnPreAuthHandler) => void;
 
 ## Remarks
 
-Can register any number of registerOnPostAuth, which are called in sequence (from the first registered to the last). See [OnPreRoutingHandler](./kibana-plugin-core-server.onpreroutinghandler.md)<!-- -->.
+Can register any number of registerOnPreAuth, which are called in sequence (from the first registered to the last). See [OnPreAuthHandler](./kibana-plugin-core-server.onpreauthhandler.md)<!-- -->.
 

docs/development/core/server/kibana-plugin-core-server.md

@@ -122,7 +122,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [OnPreAuthToolkit](./kibana-plugin-core-server.onpreauthtoolkit.md) | A tool set defining an outcome of OnPreAuth interceptor for incoming request. |
 |  [OnPreResponseExtensions](./kibana-plugin-core-server.onpreresponseextensions.md) | Additional data to extend a response. |
 |  [OnPreResponseInfo](./kibana-plugin-core-server.onpreresponseinfo.md) | Response status code. |
-|  [OnPreResponseToolkit](./kibana-plugin-core-server.onpreresponsetoolkit.md) | A tool set defining an outcome of OnPreRouting interceptor for incoming request. |
+|  [OnPreResponseToolkit](./kibana-plugin-core-server.onpreresponsetoolkit.md) | A tool set defining an outcome of OnPreResponse interceptor for incoming request. |
 |  [OnPreRoutingToolkit](./kibana-plugin-core-server.onpreroutingtoolkit.md) | A tool set defining an outcome of OnPreRouting interceptor for incoming request. |
 |  [OpsMetrics](./kibana-plugin-core-server.opsmetrics.md) | Regroups metrics gathered by all the collectors. This contains metrics about the os/runtime, the kibana process and the http server. |
 |  [OpsOsMetrics](./kibana-plugin-core-server.opsosmetrics.md) | OS related metrics |

docs/development/core/server/kibana-plugin-core-server.onpreresponsetoolkit.md

@@ -4,7 +4,7 @@
 
 ## OnPreResponseToolkit interface
 
-A tool set defining an outcome of OnPreRouting interceptor for incoming request.
+A tool set defining an outcome of OnPreResponse interceptor for incoming request.
 
 <b>Signature:</b>
 

docs/management/alerting/alerts-and-actions-intro.asciidoc

@@ -4,22 +4,23 @@
 
 beta[]
 
-The *Alerts and Actions* UI lets you <<alert-management, see and control all the alerts>> in a space, and provides tools to <<connector-management, create and manage connectors>> so that alerts can trigger actions like notification, indexing, and ticketing. 
+The *Alerts and Actions* UI lets you <<alert-management, see and control all the alerts>> in a space, and provides tools to <<connector-management, create and manage connectors>> so that alerts can trigger actions like notification, indexing, and ticketing.
 
-To manage alerting and connectors, open the menu, then go to *Stack Management > {kib} > Alerts and Actions*.
+To manage alerting and connectors, open the menu,
+then go to *Stack Management > Alerts and Insights > Alerts and Actions*.
 
 [role="screenshot"]
 image:management/alerting/images/alerts-and-actions-ui.png[Example alert listing in the Alerts and Actions UI]
 
 [NOTE]
 ============================================================================
 Similar to dashboards, alerts and connectors reside in a <<xpack-spaces, space>>.
-The *Alerts and Actions* UI only shows alerts and connectors for the current space.  
+The *Alerts and Actions* UI only shows alerts and connectors for the current space.
 ============================================================================
 
 [NOTE]
 ============================================================================
 {es} also offers alerting capabilities through Watcher, which
-can be managed through the <<watcher-ui, Watcher UI>>. See  
+can be managed through the <<watcher-ui, Watcher UI>>. See
 <<alerting-concepts-differences>> for more information.
-============================================================================
+============================================================================

docs/management/index-lifecycle-policies/add-policy-to-index.asciidoc

@@ -2,17 +2,16 @@
 [[adding-policy-to-index]]
 === Adding a policy to an index
 
-To add a lifecycle policy to an index and view the status for indices 
-managed by a policy, open the menu, then go to *Stack Management > {es} > Index Management*.  This page lists your 
-{es} indices, which you can filter by lifecycle status and lifecycle phase.  
+To add a lifecycle policy to an index and view the status for indices
+managed by a policy, open the menu, then go to *Stack Management > Data > Index Management*.
+This page lists your 
+{es} indices, which you can filter by lifecycle status and lifecycle phase.
 
 To add a policy, select the index name and then select *Manage Index > Add lifecycle policy*.
-You’ll see the policy name, the phase the index is in, the current 
-action, and if any errors occurred performing that action. 
+You’ll see the policy name, the phase the index is in, the current
+action, and if any errors occurred performing that action.
 
 To remove a policy from an index, select *Manage Index > Remove lifecycle policy*.
 
 [role="screenshot"]
 image::images/index_management_add_policy.png[][UI for adding a policy to an index]
-
-

docs/management/index-lifecycle-policies/example-index-lifecycle-policy.asciidoc

@@ -3,7 +3,7 @@
 [[example-using-index-lifecycle-policy]]
 === Tutorial: Use {ilm-init} to manage {filebeat} time-based indices
 
-With {ilm} ({ilm-init}), you can create policies that perform actions automatically 
+With {ilm} ({ilm-init}), you can create policies that perform actions automatically
 on indices as they age and grow. {ilm-init} policies help you to manage
 performance, resilience, and retention of your data during its lifecycle. This tutorial shows
 you how to use {kib}’s *Index Lifecycle Policies* to modify and create {ilm-init}
@@ -59,7 +59,7 @@ output as described in {filebeat-ref}/filebeat-getting-started.html[Getting Star
 {filebeat} includes a default {ilm-init} policy that enables rollover. {ilm-init}
 is enabled automatically if you’re using the default `filebeat.yml` and index template.
 
-To view the default policy in {kib}, open the menu, go to * Stack Management > {es} > Index Lifecycle Policies*,
+To view the default policy in {kib}, open the menu, go to *Stack Management > Data > Index Lifecycle Policies*,
 search for _filebeat_, and choose the _filebeat-version_ policy.
 
 This policy initiates the rollover action when the index size reaches 50GB or
@@ -114,7 +114,7 @@ If meeting a specific retention time period is most important, you can create a
 custom policy.  For this option, you will use {filebeat} daily indices without
 rollover.
 
-. To create a custom policy, open the menu, go to *Stack Management > {es} > Index Lifecycle Policies*, then click 
+. To create a custom policy, open the menu, go to *Stack Management > Data > Index Lifecycle Policies*, then click
 *Create policy*.
 
 . Activate the warm phase and configure it as follows:
@@ -156,7 +156,7 @@ image::images/tutorial-ilm-custom-policy.png["Modify the custom policy to add a
 [role="screenshot"]
 image::images/tutorial-ilm-delete-phase-creation.png["Delete phase"]
 
-. To configure the index to use the new policy, open the menu, then go to *Stack Management > {es} > Index Lifecycle
+. To configure the index to use the new policy, open the menu, then go to *Stack Management > Data > Index Lifecycle
 Policies*.
 
 .. Find your {ilm-init} policy.

docs/management/ingest-pipelines/ingest-pipelines.asciidoc

@@ -7,7 +7,7 @@ pipelines that perform common transformations and
 enrichments on your data.  For example, you might remove a field,
 rename an existing field, or set a new field.
 
-You’ll find *Ingest Node Pipelines* in *Management > Elasticsearch*. With this feature, you can:
+You’ll find *Ingest Node Pipelines* in *Stack Management > Ingest*. With this feature, you can:
 
 * View a list of your pipelines and drill down into details.
 * Create a pipeline that defines a series of tasks, known as processors.
@@ -23,7 +23,7 @@ image:management/ingest-pipelines/images/ingest-pipeline-list.png["Ingest node p
 The minimum required permissions to access *Ingest Node Pipelines* are
 the `manage_pipeline` and `cluster:monitor/nodes/info` cluster privileges.
 
-You can add these privileges in *Management > Security > Roles*.
+You can add these privileges in *Stack Management > Security > Roles*.
 
 [role="screenshot"]
 image:management/ingest-pipelines/images/ingest-pipeline-privileges.png["Privileges required for Ingest Node Pipelines"]

docs/management/managing-beats.asciidoc

@@ -4,7 +4,8 @@
 
 include::{asciidoc-dir}/../../shared/discontinued.asciidoc[tag=cm-discontinued]
 
-To use the Central Management UI, open the menu, go to *Stack Management > {beats} > Central Management*, then define and
+To use {beats} Central Management UI, open the menu, go to *Stack Management > Ingest >
+{beats} Central Management*, then define and
 manage configurations in a central location in {kib} and quickly deploy
 configuration changes to all {beats} running across your enterprise. For more
 about central management, see the related {beats} documentation:
@@ -17,8 +18,8 @@ about central management, see the related {beats} documentation:
 This feature requires an Elastic license that includes {beats} central
 management.
 
-Don't have a license? You can start a 30-day trial. Open the menu, go to
-*Stack Management > Elasticsearch > License Management*. At the end of the trial
+Don't have a license? You can start a 30-day trial. Open the menu,
+go to *Stack Management > Stack > License Management*. At the end of the trial
 period, you can purchase a subscription to keep using central management. For
 more information, see https://www.elastic.co/subscriptions and
 <<managing-licenses>>.

docs/management/managing-ccr.asciidoc

@@ -7,7 +7,7 @@ remote clusters on a local cluster. {ref}/xpack-ccr.html[Cross-cluster replicati
 is commonly used to provide remote backups for disaster recovery and for
 geo-proximite copies of data.
 
-To get started, open the menu, then go to *Stack Management > Elasticsearch > Cross-Cluster Replication*.
+To get started, open the menu, then go to *Stack Management > Data > Cross-Cluster Replication*.
 
 [role="screenshot"]
 image::images/cross-cluster-replication-list-view.png[][Cross-cluster replication list view]

docs/management/managing-indices.asciidoc

@@ -13,7 +13,7 @@ the amount of bookkeeping when working with indices. Instead of manually
 setting up your indices, you can create them automatically from a template,
 ensuring that your settings, mappings, and aliases are consistently defined.
 
-To manage your indices, open the menu, then go to *Stack Management > {es} > Index Management*.
+To manage your indices, open the menu, then go to *Stack Management > Data > Index Management*.
 
 [role="screenshot"]
 image::images/management_index_labels.png[Index Management UI]
@@ -130,17 +130,17 @@ Alternatively, you can click the *Load JSON* link and define the mapping as JSON
 
 [source,js]
 ----------------------------------
-{	
+{
   "properties": {
     "geo": {
-      "properties": {	
-        "coordinates": {	
-          "type": "geo_point"	
-        }  	
-      }    	
-    }	
-  }	
-}	
+      "properties": {
+        "coordinates": {
+          "type": "geo_point"
+        }
+      }
+    }
+  }
+}
 ----------------------------------
 
 You can create additional mapping configurations in the *Dynamic templates* and

docs/management/managing-licenses.asciidoc

@@ -7,7 +7,7 @@ with no expiration date. For the full list of features, refer to
 
 If you want to try out the full set of features, you can activate a free 30-day
 trial. To view the status of your license, start a trial, or install a new
-license, open the menu, then go to *Stack Management > {es} > License Management*.
+license, open the menu, then go to *Stack Management > Stack > License Management*.
 
 NOTE: You can start a trial only if your cluster has not already activated a
 trial license for the current major product version. For example, if you have

docs/management/managing-remote-clusters.asciidoc

@@ -6,7 +6,7 @@ connection from your cluster to other clusters. This functionality is
 required for {ref}/xpack-ccr.html[cross-cluster replication] and
 {ref}/modules-cross-cluster-search.html[cross-cluster search].
 
-To get started, open the menu, then go to *Stack Management > {es} > Remote Clusters*.
+To get started, open the menu, then go to *Stack Management > Data > Remote Clusters*.
 
 [role="screenshot"]
 image::images/remote-clusters-list-view.png[Remote Clusters list view, including Add a remote cluster button]

docs/management/rollups/create_and_manage_rollups.asciidoc

@@ -8,7 +8,7 @@ by an index pattern, and then rolls it into a new index. Rollup indices are a go
 compactly store months or years of historical
 data for use in visualizations and reports.
 
-To get started, open the menu, then go to *Stack Management > {es} > Rollup Jobs*. With this UI,
+To get started, open the menu, then go to *Stack Management > Data > Rollup Jobs*. With this UI,
 you can:
 
 * <<create-and-manage-rollup-job, Create a rollup job>>
@@ -130,8 +130,9 @@ Your next step is to visualize your rolled up data in a vertical bar chart.
 Most visualizations support rolled up data, with the exception of Timelion and Vega visualizations.
 
 
-. Create the rollup index pattern in *Management > Index Patterns* so you can
-select your rolled up data for visualizations. Click *Create index pattern*, and select *Rollup index pattern* from the dropdown.
+. Go to *Stack Management > {kib} > Index Patterns*.
+
+. Click *Create index pattern*, and select *Rollup index pattern* from the dropdown.
 +
 [role="screenshot"]
 image::images/management-rollup-index-pattern.png[][Create rollup index pattern]
@@ -144,7 +145,9 @@ is `rollup_logstash,kibana_sample_data_logs`. In this index pattern, `rollup_log
 matches the rolled up index pattern and `kibana_sample_data_logs` matches the index
 pattern for raw data.
 
-. Go to *Visualize* and create a vertical bar chart. Choose `rollup_logstash,kibana_sample_data_logs`
+. Go to *Visualize* and create a vertical bar chart.
+
+. Choose `rollup_logstash,kibana_sample_data_logs`
 as your source to see both the raw and rolled up data.
 +
 [role="screenshot"]