Merge branch '7.x' into backport/7.x/pr-59928

elastic · Mar 12, 2020 · dac5a4b · dac5a4b
2 parents 1dd445d + 7f645bd
commit dac5a4b
Show file tree

Hide file tree

Showing 62 changed files with 842 additions and 889 deletions.
diff --git a/docs/user/visualize.asciidoc b/docs/user/visualize.asciidoc
@@ -37,14 +37,14 @@ Quickly build several types of basic visualizations by simply dragging and dropp
 <<timelion,Timelion>>:: Computes and combine data from multiple time series
 data sets.
 
-<<visualize-maps, Maps>>::
+Maps::
 * *<<maps,Elastic Maps>>* &mdash; Displays geospatial data in {kib}.
 
-* *Coordinate map* &mdash; Displays points on a map using a geohash aggregation.
+* *<<visualize-maps,Coordinate map>>* &mdash; Displays points on a map using a geohash aggregation.
 
-* *Region map* &mdash; Merges any structured map data onto a shape.
+* *<<visualize-maps,Region map>>* &mdash; Merges any structured map data onto a shape.
 
-* *Heat map* &mdash; Displays shaded cells within a matrix.
+* *<<heat-map,Heat map>>* &mdash; Displays shaded cells within a matrix.
 
 <<for-dashboard,Dashboard tools>>::
 
@@ -139,6 +139,7 @@ include::{kib-repo-dir}/visualize/tsvb.asciidoc[]
 include::{kib-repo-dir}/visualize/timelion.asciidoc[]
 
 include::{kib-repo-dir}/visualize/tilemap.asciidoc[]
+include::{kib-repo-dir}/visualize/heatmap.asciidoc[]
 
 include::{kib-repo-dir}/visualize/for-dashboard.asciidoc[]
 

diff --git a/docs/visualize/heatmap.asciidoc b/docs/visualize/heatmap.asciidoc
@@ -0,0 +1,40 @@
+[[heat-map]]
+== Heat map
+
+Display graphical representations of data where the individual values are represented by colors. Use heat maps when your data set includes categorical data. For example, use a heat map to see the flights of origin countries compared to destination countries using the sample flight data.
+
+[role="screenshot"]
+image::images/visualize_heat_map_example.png[]
+
+[float]
+[[build-heat-map]]
+==== Build a heat map
+
+To display your data on the heat map, use the supported aggregations.
+
+Heat maps support the following aggregations:
+
+* <<visualize-metric-aggregations,Metric>>
+* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
+* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
+* <<visualize-bucket-aggregations,Bucket>>
+
+[float]
+[[navigate-heatmap]]
+==== Change the color ranges
+
+When only one color displays on the heat map, you might need to change the color ranges.
+
+To specify the number of color ranges:
+
+. Click *Options*.
+
+. Enter the *Number of colors* to display.
+
+To specify custom ranges:
+
+. Click *Options*.
+
+. Select *Use custom ranges*.
+
+. Enter the ranges to display.
diff --git a/docs/visualize/tilemap.asciidoc b/docs/visualize/tilemap.asciidoc
@@ -9,8 +9,6 @@ Visualize supports the following maps:
 
 * *Region* &mdash; Display colored boundary vector shapes using a gradient. Darker colors indicate larger values, and lighter colors indicate smaller values.
 
-* *Heat* &mdash; Display graphical representations of data where the individual values are represented by colors.
-
 NOTE: The maps in Visualize have been replaced with <<maps>>, which offers more functionality.
 
 [float]
@@ -98,45 +96,3 @@ To navigate the region map, use the navigation options.
 * To change the zoom level, click *Zoom In* or *Zoom out* image:images/viz-zoom.png[].
 
 * To automatically crop the map boundaries, click *Fit Data Bounds* image:images/viz-fit-bounds.png[].
-
-[float]
-[[heat-map]]
-=== Heat map
-
-Use heat maps when your data set includes categorical data. For example, use a heat map to see the flights of origin countries compared to destination countries using the sample flight data.
-
-[role="screenshot"]
-image::images/visualize_heat_map_example.png[]
-
-[float]
-[[build-heat-map]]
-==== Build a heat map
-
-To display your data on the heat map, use the supported aggregations.
-
-Heat maps support the following aggregations:
-
-* <<visualize-metric-aggregations,Metric>>
-* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
-* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
-* <<visualize-bucket-aggregations,Bucket>>
-
-[float]
-[[navigate-heatmap]]
-==== Change the color ranges
-
-When only one color displays on the heat map, you might need to change the color ranges.
-
-To specify the number of color ranges:
-
-. Click *Options*.
-
-. Enter the *Number of colors* to display.
-
-To specify custom ranges:
-
-. Click *Options*.
-
-. Select *Use custom ranges*.
-
-. Enter the ranges to display.
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts