Merge branch 'master' into show_zoom

docs/apm/transactions.asciidoc

@@ -103,9 +103,7 @@ The number of requests per bucket is displayed when hovering over the graph, and
 [role="screenshot"]
 image::apm/images/apm-transaction-duration-dist.png[Example view of transactions duration distribution graph]
 
-Most of the requests fall into buckets on the left side of the graph,
-with a long tail of smaller buckets to the right.
-This is a typical distribution, and indicates most of our requests were served quickly - awesome!
+This graph shows a typical distribution, and indicates most of our requests were served quickly - awesome!
 It's the requests on the right, the ones taking longer than average, that we probably want to focus on.
 When you select one of these buckets,
 you're presented with up to ten trace samples.

docs/canvas/canvas-elements.asciidoc

@@ -138,7 +138,9 @@ To apply CSS overrides:
 
 . Next to *Element style*, click *+*, then select *CSS*.
 
-. Enter the *CSS*. For example, to center the Markdown element, enter:
+. Enter the *CSS*.
++
+For example, to center the Markdown element, enter:
 +
 [source,text]
 --------------------------------------------------

docs/canvas/canvas-present-workpad.asciidoc

@@ -8,7 +8,7 @@ When you are ready to present your workpad, use and enable the presentation opti
 [[view-fullscreen-mode]]
 ==== View your workpad in fullscreen mode
 
-In the upper left corner, click the *Enter fullscreen mode* icon.
+Click the *Enter fullscreen mode* icon.
 
 [role="screenshot"]
 image::images/canvas-fullscreen.png[Fullscreen mode]
@@ -19,7 +19,7 @@ image::images/canvas-fullscreen.png[Fullscreen mode]
 
 Automatically cycle through your workpads pages in fullscreen mode.
 
-. In the upper left corner, click the *Control settings* icon.
+. Click the *Control settings* icon.
 
 . Under *Change cycling interval*, select the interval you want to use.
 +

docs/canvas/canvas-share-workpad.asciidoc

@@ -10,7 +10,7 @@ When you've finished your workpad, you can share it outside of {kib}.
 
 Create a JSON file of your workpad that you can export outside of {kib}.
 
-. From your workpad, click the *Share workpad* icon in the upper left corner.
+. From your workpad, click the *Share workpad* icon.
 
 . Select *Download as JSON*.
 +
@@ -27,7 +27,7 @@ If you have a license that supports the {report-features}, you can create a PDF
 
 For more information, refer to <<reporting-getting-started, Reporting from Kibana>>.
 
-. From your workpad, click the *Share workpad* icon in the upper left corner, then select *PDF reports*.
+. From your workpad, click the *Share workpad* icon, then select *PDF reports*.
 
 . Click *Generate PDF*.
 +
@@ -42,7 +42,7 @@ If you have a license that supports the {report-features}, you can create a POST
 
 For more information, refer to <<automating-report-generation, Automating report generation>>.
 
-. From your workpad, click the *Share workpad* icon in the upper left corner, then select *PDF reports*.
+. From your workpad, click the *Share workpad* icon, then select *PDF reports*.
 
 . Click *Copy POST URL*.
 +
@@ -55,7 +55,7 @@ image::images/canvas-create-URL.gif[Create POST URL]
 
 beta[] Canvas allows you to create _shareables_, which are workpads that you download and securely share on any website. To customize the behavior of the workpad on your website, you can choose to autoplay the pages or hide the workpad toolbar.
 
-. From your workpad, click the *Share this workpad* icon in the upper left corner, then select *Share on a website*.
+. From your workpad, click the *Share this workpad* icon, then select *Share on a website*.
 
 . On the *Share on a website* pane, follow the instructions.
 

docs/dev-tools/searchprofiler/getting-started.asciidoc

@@ -3,10 +3,10 @@
 === Getting Started
 
 The {searchprofiler} is automatically enabled in {kib}.  Go to *Dev Tools > Search Profiler*
-to get started. 
+to get started.
 
 {searchprofiler} displays the names of the indices searched, the shards in each index,
-and how long it took for the query to complete. To try it out, replace the default `match_all` query 
+and how long it took for the query to complete. To try it out, replace the default `match_all` query
 with the query you want to profile and click *Profile*.
 
 The following example shows the results of profiling the `match_all` query.
@@ -29,8 +29,8 @@ While the Cumulative Time metric is useful for comparing the performance of your
 indices and shards, it doesn't necessarily represent the actual physical query times.
 ====
 
-You can select the name of the shard and then click *View details* to see more profiling information, 
-including details about the query component(s) that ran on the shard, as well as the timing 
+You can select the name of the shard and then click *View details* to see more profiling information,
+including details about the query component(s) that ran on the shard, as well as the timing
 breakdown of low-level Lucene methods. For more information, see {ref}/search-profile.html#profiling-queries[Profiling queries].
 
 [float]
@@ -40,10 +40,10 @@ By default, all queries executed by the {searchprofiler} are sent
 to `GET /_search`. It searches across your entire cluster (all indices, all types).
 
 If you need to query a specific index or type (or several), you can use the Index
-and Type filters at the top left.
+and Type filters.
 
 In the following example, the query is executed against the indices `test` and `kibana_1`
 and the type `my_type`. This is equivalent making a request to `GET /test,kibana_1/my_type/_search`.
 
 [role="screenshot"]
-image::dev-tools/searchprofiler/images/filter.png["Filtering by index and type"]
+image::dev-tools/searchprofiler/images/filter.png["Filtering by index and type"]

docs/discover/document-data.asciidoc

@@ -26,7 +26,7 @@ and click image:images/sort-icon.png[].
 The first click sorts by ascending order, the second click sorts by descending order, and the third
 click removes the field from the sorted fields.
 
-Move a field column:: Hover over the column header and click the move left (<<) or move right icon (>>).
+Move a field column:: Hover over the column header and click the (<<) or (>>) icons.
 Remove&nbsp;a&nbsp;field&nbsp;column&nbsp;:: Hover over the list of *Specified fields*
 and then click *remove*.
 Or, use the (x) control in the column header.

docs/getting-started/tutorial-visualizing.asciidoc

@@ -180,5 +180,5 @@ The map now looks like this:
 image::images/tutorial-visualize-map-2.png[]
 
 . Navigate the map by clicking and dragging.  Use the controls
-on the left to zoom the map and set filters.
+to zoom the map and set filters.
 . *Save* this map with the name `Map Example`.

docs/infrastructure/view-metrics.asciidoc

@@ -30,11 +30,3 @@ For complete control over the start and end times, click the start time or end t
 === Refresh the metrics
 
 You can click *Refresh* to manually refresh the metrics.
-
-[float]
-[[infra-view-go-to-chart]]
-=== Go to a specific chart
-
-The charts available for this component are shown in a list on the left of the page. Click a chart in the list to quickly go to that chart.
-
-

docs/management/managing-licenses.asciidoc

@@ -15,8 +15,7 @@ already activated a trial for 6.0, you cannot start a new trial until
 7.0. You can, however, contact `[email protected]` to request an extended trial
 license.
 
-When you activate a new license level, new features appear in the left sidebar
-of the *Management* page.
+When you activate a new license level, new features appear in *Management*.
 
 [role="screenshot"]
 image::images/management-license.png[]

docs/spaces/index.asciidoc

@@ -9,10 +9,10 @@ the dashboards and saved objects that belong to that space.
 {kib} creates a default space for you.
 After you create your own
 spaces, you're asked to choose a space when you log in to Kibana. You can change your
-current space at any time by using the menu in the upper left.
+current space at any time by using the menu.
 
 [role="screenshot"]
-image::spaces/images/change-space.png["Change current space"]
+image::spaces/images/change-space.png["Change current space menu"]
 
 Kibana supports spaces in several ways.  You can:
 

docs/user/dashboard.asciidoc

@@ -93,7 +93,7 @@ In *Edit* mode, you can move, resize, customize, and delete panels to suit your
 * To resize a panel, click the resize control on the lower right and drag
 to the new dimensions.
 
-* To toggle the use of margins and panel titles, use the *Options* menu in the upper left.
+* To toggle the use of margins and panel titles, use the *Options* menu.
 
 * To delete a panel, open the panel menu and select *Delete from dashboard.* Deleting a panel from a
 dashboard does *not* delete the saved visualization or search.

docs/user/discover.asciidoc

@@ -24,7 +24,7 @@ image::images/Discover-Start.png[Discover]
 === Set up your index pattern
 
 The first thing to do in *Discover* is to select an <<index-patterns, index pattern>>, which
-defines the data you want to explore and visualize. The current index pattern is in the upper left.
+defines the data you want to explore and visualize.
 If you haven't yet created an index pattern, you can add a <<add-sample-data, sample data set>>,
 which has a pre-built index pattern.
 
@@ -69,7 +69,7 @@ image::images/filter-field.png[height=317]
 The sortable documents table
 lists the documents that match your search.
 By default, the table includes columns for the time field and the document `_source`.
-To zero in on a specific field, click *add* next to the field name in the left sidebar.
+To zero in on a specific field, click *add* next to the field name.
 For example, if you add the `currency`, `customer_last_name`, and `day_of_week` fields,
 the document table includes columns for those three fields.
 

docs/visualize/lens.asciidoc

@@ -32,7 +32,7 @@ Lens supports the following aggregations:
 [[drag-drop]]
 === Drag and drop
 
-The data panel in the left column shows the data fields for the selected time period. When
+The panel shows the data fields for the selected time period. When
 you drag a field from the data panel, Lens highlights where you can drop that field. The first time you drag a data field,
 you'll see two places highlighted in green:
 
@@ -57,7 +57,7 @@ Lens shows you fields based on the <<index-patterns, index patterns>> you have d
 {kib}, and the current time range. When you change the index pattern or time filter,
 the list of fields are updated.
 
-To narrow the list of fields you see in the left panel, you can:
+To narrow the list of fields, you can:
 
 * Enter the field name in *Search field names*.
 
@@ -100,11 +100,7 @@ still allows you to make the change.
 
 Lens allows some customizations of the data for each visualization.
 
-. Change the index pattern.
-
-.. In the left column, click the index pattern name.
-
-.. Select the new index pattern.
+. Click the index pattern name, then select the new index pattern.
 +
 If there is a match, Lens displays the new data. All fields that do not match the index pattern are removed.
 
@@ -147,7 +143,7 @@ Drag and drop your data onto the visualization builder pane.
 
 . On the *New Visualization* window, click *Lens*.
 
-. In the left column, select the *kibana_sample_data_ecommerce* index.
+. Select the *kibana_sample_data_ecommerce* index.
 
 . Click image:images/time-filter-calendar.png[], then click *Last 7 days*. The list of data fields are updated.
 

package.json

@@ -126,7 +126,7 @@
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.4.0",
-    "@elastic/request-crypto": "^1.0.2",
+    "@elastic/request-crypto": "1.1.2",
     "@elastic/ui-ace": "0.2.3",
     "@hapi/good-squeeze": "5.2.1",
     "@hapi/wreck": "^15.0.2",

test/scripts/jenkins_visual_regression.sh

@@ -12,7 +12,7 @@ tar -xzf "$linuxBuild" -C "$installDir" --strip=1
 
 echo " -> running visual regression tests from kibana directory"
 checks-reporter-with-killswitch "X-Pack visual regression tests" \
-  yarn percy exec -t 500 \
+  yarn percy exec -t 500 -- -- \
   node scripts/functional_tests \
     --debug --bail \
     --kibana-install-dir "$installDir" \

test/scripts/jenkins_xpack_visual_regression.sh

@@ -14,7 +14,7 @@ tar -xzf "$linuxBuild" -C "$installDir" --strip=1
 echo " -> running visual regression tests from x-pack directory"
 cd "$XPACK_DIR"
 checks-reporter-with-killswitch "X-Pack visual regression tests" \
-  yarn percy exec -t 500 \
+  yarn percy exec -t 500 -- -- \
   node scripts/functional_tests \
     --debug --bail \
     --kibana-install-dir "$installDir" \

x-pack/legacy/plugins/monitoring/common/constants.ts

@@ -239,15 +239,11 @@ export const ALERT_TYPE_PREFIX = 'monitoring_';
  * This is the alert type id for the license expiration alert
  */
 export const ALERT_TYPE_LICENSE_EXPIRATION = `${ALERT_TYPE_PREFIX}alert_type_license_expiration`;
-/**
- * This is the alert type id for the cluster state alert
- */
-export const ALERT_TYPE_CLUSTER_STATE = `${ALERT_TYPE_PREFIX}alert_type_cluster_state`;
 
 /**
  * A listing of all alert types
  */
-export const ALERT_TYPES = [ALERT_TYPE_LICENSE_EXPIRATION, ALERT_TYPE_CLUSTER_STATE];
+export const ALERT_TYPES = [ALERT_TYPE_LICENSE_EXPIRATION];
 
 /**
  * Matches the id for the built-in in email action type
@@ -258,7 +254,7 @@ export const ALERT_ACTION_TYPE_EMAIL = '.email';
 /**
  * The number of alerts that have been migrated
  */
-export const NUMBER_OF_MIGRATED_ALERTS = 2;
+export const NUMBER_OF_MIGRATED_ALERTS = 1;
 
 /**
  * The advanced settings config name for the email address

x-pack/legacy/plugins/monitoring/public/components/alerts/alerts.js

@@ -6,15 +6,10 @@
 
 import React from 'react';
 import chrome from '../../np_imports/ui/chrome';
-import { capitalize, get } from 'lodash';
+import { capitalize } from 'lodash';
 import { formatDateTimeLocal } from '../../../common/formatting';
 import { formatTimestampToDuration } from '../../../common';
-import {
-  CALCULATE_DURATION_SINCE,
-  EUI_SORT_DESCENDING,
-  ALERT_TYPE_LICENSE_EXPIRATION,
-  ALERT_TYPE_CLUSTER_STATE,
-} from '../../../common/constants';
+import { CALCULATE_DURATION_SINCE, EUI_SORT_DESCENDING } from '../../../common/constants';
 import { mapSeverity } from './map_severity';
 import { FormattedAlert } from 'plugins/monitoring/components/alerts/formatted_alert';
 import { EuiMonitoringTable } from 'plugins/monitoring/components/table';
@@ -26,8 +21,6 @@ const linkToCategories = {
   'elasticsearch/indices': 'Elasticsearch Indices',
   'kibana/instances': 'Kibana Instances',
   'logstash/instances': 'Logstash Nodes',
-  [ALERT_TYPE_LICENSE_EXPIRATION]: 'License expiration',
-  [ALERT_TYPE_CLUSTER_STATE]: 'Cluster state',
 };
 const getColumns = (kbnUrl, scope, timezone) => [
   {
@@ -101,22 +94,19 @@ const getColumns = (kbnUrl, scope, timezone) => [
     }),
     field: 'message',
     sortable: true,
-    render: (_message, alert) => {
-      const message = get(alert, 'message.text', get(alert, 'message', ''));
-      return (
-        <FormattedAlert
-          prefix={alert.prefix}
-          suffix={alert.suffix}
-          message={message}
-          metadata={alert.metadata}
-          changeUrl={target => {
-            scope.$evalAsync(() => {
-              kbnUrl.changePath(target);
-            });
-          }}
-        />
-      );
-    },
+    render: (message, alert) => (
+      <FormattedAlert
+        prefix={alert.prefix}
+        suffix={alert.suffix}
+        message={message}
+        metadata={alert.metadata}
+        changeUrl={target => {
+          scope.$evalAsync(() => {
+            kbnUrl.changePath(target);
+          });
+        }}
+      />
+    ),
   },
   {
     name: i18n.translate('xpack.monitoring.alerts.categoryColumnTitle', {
@@ -158,8 +148,8 @@ const getColumns = (kbnUrl, scope, timezone) => [
 export const Alerts = ({ alerts, angular, sorting, pagination, onTableChange }) => {
   const alertsFlattened = alerts.map(alert => ({
     ...alert,
-    status: get(alert, 'metadata.severity', get(alert, 'severity', 0)),
-    category: get(alert, 'metadata.link', get(alert, 'type', null)),
+    status: alert.metadata.severity,
+    category: alert.metadata.link,
   }));
 
   const injector = chrome.dangerouslyGetActiveInjector();