Merge branch 'master' into expression_repeat_image

# Conflicts:
#	x-pack/plugins/translations/translations/zh-CN.json

.i18nrc.json

@@ -1,5 +1,6 @@
 {
   "paths": {
+    "autocomplete": "packages/kbn-securitysolution-autocomplete/src",
     "console": "src/plugins/console",
     "core": "src/core",
     "discover": "src/plugins/discover",

docs/developer/getting-started/monorepo-packages.asciidoc

@@ -91,6 +91,7 @@ yarn kbn watch-bazel
 - @kbn/optimizer
 - @kbn/plugin-helpers
 - @kbn/rule-data-utils
+- @kbn/securitysolution-autocomplete
 - @kbn/securitysolution-es-utils
 - @kbn/securitysolution-hook-utils
 - @kbn/securitysolution-io-ts-alerting-types

docs/management/upgrade-assistant/index.asciidoc

@@ -2,60 +2,22 @@
 [[upgrade-assistant]]
 == Upgrade Assistant
 
-The Upgrade Assistant helps you prepare for your upgrade to the next major {es} version.
-For example, if you are using 6.8, the Upgrade Assistant helps you to upgrade to 7.0.
-To access the assistant, open the main menu, then click *Stack Management > Upgrade Assistant*.
+The Upgrade Assistant helps you prepare for your upgrade 
+to the next major version of the Elastic Stack.
+To access the assistant, open the main menu and go to *Stack Management > Upgrade Assistant*.
 
-The assistant identifies the deprecated settings in your cluster and indices
-and guides you through the process of resolving issues, including reindexing.
+The assistant identifies deprecated settings in your configuration,
+enables you to see if you are using deprecated features,
+and guides you through the process of resolving issues.
 
-Before you upgrade, make sure that you are using the latest released minor
-version of {es} to see the most up-to-date deprecation issues.
-For example, if you want to upgrade to 7.0, make sure that you are using 6.8.
+If you have indices that were created prior to 7.0,
+you can use the assistant to reindex them so they can be accessed from 8.0. 
 
-[float]
+IMPORTANT: To see the most up-to-date deprecation information before 
+upgrading to 8.0, upgrade to the latest 7.n release.
+
+[discrete]
 === Required permissions
 
 The `manage` cluster privilege is required to access the *Upgrade assistant*.
-Additional privileges may be needed to perform certain actions.
-
-To add the privilege, open the main menu, then click *Stack Management > Roles*.
-
-[float]
-=== Reindexing
-
-The *Indices* page lists the indices that are incompatible with the next
-major version of {es}. You can initiate a reindex to resolve the issues.
-
-[role="screenshot"]
-image::images/management-upgrade-assistant-9.0.png[]
-
-For a preview of how the data will change during the reindex, select the
-index name. A warning appears if the index requires destructive changes.
-Back up your index, then proceed with the reindex by accepting each breaking change.
-
-You can follow the progress as the Upgrade Assistant makes the index read-only,
-creates a new index, reindexes the documents, and creates an alias that points
-from the old index to the new one.
-
-If the reindexing fails or is cancelled, the changes are rolled back, the
-new index is deleted, and the original index becomes writable. An error
-message explains the reason for the failure.
-
-You can reindex multiple indices at a time, but keep an eye on the
-{es} metrics, including CPU usage, memory pressure, and disk usage. If a
-metric is so high it affects query performance, cancel the reindex and
-continue by reindexing fewer indices at a time.
-
-Additional considerations:
-
-* If you use {alert-features}, when you reindex the internal indices
-(`.watches`), the {watcher} process pauses and no alerts are triggered.
-
-* If you use {ml-features}, when you reindex the internal indices (`.ml-state`),
-the {ml} jobs pause and models are not trained or updated.
-
-* If you use {security-features}, before you reindex the internal indices
-(`.security*`), it is a good idea to create a temporary superuser account in the
-`file` realm. For more information, see
-{ref}/configuring-file-realm.html[Configuring a file realm].
+Additional privileges may be needed to perform certain actions.

docs/user/alerting/alerting-getting-started.asciidoc

@@ -125,7 +125,7 @@ image::images/rule-concepts-summary.svg[Rules, connectors, alerts and actions wo
 [[alerting-concepts-differences]]
 == Differences from Watcher
 
-{kib} alerting and <<watcher-ui, {es} alerting>> are both used to detect conditions and can trigger actions in response, but they are completely independent alerting systems.
+{kib} alerting and <<watcher-ui,Watcher>> are both used to detect conditions and can trigger actions in response, but they are completely independent alerting systems.
 
 This section will clarify some of the important differences in the function and intent of the two systems.
 

docs/user/alerting/create-and-manage-rules.asciidoc

@@ -158,7 +158,7 @@ image:images/bulk-mute-disable.png[The Manage rules button lets you mute/unmute,
 A rule can have one of the following statuses:
 
 `active`:: The conditions for the rule have been met, and the associated actions should be invoked.
-`ok`:: The conditions for the rule were previously met, but no longer. Changed to `recovered` in the 7.14 release.
+`ok`:: The conditions for the rule have not been met, and the associated actions are not invoked.
 `error`:: An error was encountered during rule execution.
 `pending`:: The rule has not yet executed.  The rule was either just created, or enabled after being disabled.
 `unknown`:: A problem occurred when calculating the status. Most likely, something went wrong with the alerting code.

package.json

@@ -140,6 +140,7 @@
     "@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl",
     "@kbn/monaco": "link:bazel-bin/packages/kbn-monaco",
     "@kbn/rule-data-utils": "link:bazel-bin/packages/kbn-rule-data-utils",
+    "@kbn/securitysolution-autocomplete": "link:bazel-bin/packages/kbn-securitysolution-autocomplete",
     "@kbn/securitysolution-es-utils": "link:bazel-bin/packages/kbn-securitysolution-es-utils",
     "@kbn/securitysolution-hook-utils": "link:bazel-bin/packages/kbn-securitysolution-hook-utils",
     "@kbn/securitysolution-io-ts-alerting-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types",

packages/BUILD.bazel

@@ -36,6 +36,7 @@ filegroup(
       "//packages/kbn-plugin-generator:build",
       "//packages/kbn-plugin-helpers:build",
       "//packages/kbn-rule-data-utils:build",
+      "//packages/kbn-securitysolution-autocomplete:build",
       "//packages/kbn-securitysolution-list-constants:build",
       "//packages/kbn-securitysolution-io-ts-types:build",
       "//packages/kbn-securitysolution-io-ts-alerting-types:build",