Skip to content

Commit 5e9cfef

Browse files
committed
Merge remote-tracking branch 'upstream/master' into kbn-50308-so-management-object-view-to-react
2 parents 0015f2a + 4090149 commit 5e9cfef

33 files changed

Lines changed: 1920 additions & 1021 deletions

File tree

.eslintrc.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ const ELASTIC_LICENSE_HEADER = `
4949
*/
5050
`;
5151

52-
const allMochaRules = {};
52+
const allMochaRulesOff = {};
5353
Object.keys(require('eslint-plugin-mocha').rules).forEach(k => {
54-
allMochaRules['mocha/' + k] = 'off';
54+
allMochaRulesOff['mocha/' + k] = 'off';
5555
});
5656

5757
module.exports = {
@@ -524,7 +524,7 @@ module.exports = {
524524
*/
525525
{
526526
files: ['test/harden/*.js'],
527-
rules: allMochaRules,
527+
rules: allMochaRulesOff,
528528
},
529529

530530
/**

docs/getting-started/tutorial-discovering.asciidoc

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
[[tutorial-discovering]]
22
=== Discover your data
33

4-
Using *Discover*, you can enter
4+
Using *Discover*, enter
55
an {ref}/query-dsl-query-string-query.html#query-string-syntax[Elasticsearch
66
query] to search your data and filter the results.
77

88
. Open *Discover*.
99
+
10-
The current index pattern appears below the filter bar, in this case `shakes*`.
11-
You might need to click *New* in the menu bar to refresh the data.
10+
The `shakes*` index pattern appears.
1211

13-
. Click the caret to the right of the current index pattern, and select `ba*`.
12+
. To make `ba*` the current index, click the index pattern dropdown, then select `ba*`.
1413
+
1514
By default, all fields are shown for each matching document.
1615

17-
. In the search field, enter the following string:
16+
. In the search field, enter:
1817
+
1918
[source,text]
2019
account_number<100 AND balance>47500
@@ -25,11 +24,10 @@ excess of 47,500. Results appear for account numbers 8, 32, 78, 85, and 97.
2524
[role="screenshot"]
2625
image::images/tutorial-discover-2.png[]
2726
+
28-
. To choose which
29-
fields to display, hover the pointer over the list of *Available fields*
30-
and then click *add* next to each field you want include as a column in the table.
27+
. Hover over the list of *Available fields*, then
28+
click *add* next to each field you want include as a column in the table.
3129
+
32-
For example, if you add the `account_number` field, the display changes to a list of five
30+
For example, when you add the `account_number` field, the display changes to a list of five
3331
account numbers.
3432
+
3533
[role="screenshot"]
Lines changed: 34 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[[managing-fields]]
2-
== Index Patterns and Fields
2+
== Index patterns and fields
33

44
The *Index patterns* UI helps you create and manage
5-
the index patterns that retrieve your data from Elasticsearch.
5+
the index patterns that retrieve your data from {es}.
66

77
[role="screenshot"]
88
image::images/management-index-patterns.png[]
99

1010
[float]
1111
=== Create an index pattern
1212

13-
An index pattern is the glue that connects Kibana to your Elasticsearch data. Create an
14-
index pattern whenever you load your own data into Kibana. To get started,
13+
An index pattern is the glue that connects {kib} to your {es} data. Create an
14+
index pattern whenever you load your own data into {kib}. To get started,
1515
click *Create index pattern*, and then follow the guided steps. Refer to
1616
<<index-patterns, Creating an index pattern>> for the types of index patterns
1717
that you can create.
@@ -33,7 +33,7 @@ you create is automatically designated as the default pattern. The default
3333
index pattern is loaded when you open *Discover*.
3434

3535
* *Refresh the index fields list.* You can refresh the index fields list to
36-
pick up any newly-added fields. Doing so also resets Kibana’s popularity counters
36+
pick up any newly-added fields. Doing so also resets the {kib} popularity counters
3737
for the fields. The popularity counters are used in *Discover* to sort fields in lists.
3838

3939
* [[delete-pattern]]*Delete the index pattern.* This action removes the pattern from the list of
@@ -60,7 +60,7 @@ Kibana has field formatters for the following field types:
6060
* <<field-formatters-numeric, Numbers>>
6161

6262
[[field-formatters-string]]
63-
=== String Field Formatters
63+
=== String field formatters
6464

6565
String fields support the `String` and `Url` formatters.
6666

@@ -69,7 +69,7 @@ include::field-formatters/string-formatter.asciidoc[]
6969
include::field-formatters/url-formatter.asciidoc[]
7070

7171
[[field-formatters-date]]
72-
=== Date Field Formatters
72+
=== Date field formatters
7373

7474
Date fields support the `Date`, `Url`, and `String` formatters.
7575

@@ -81,19 +81,19 @@ include::field-formatters/string-formatter.asciidoc[]
8181
include::field-formatters/url-formatter.asciidoc[]
8282

8383
[[field-formatters-geopoint]]
84-
=== Geographic Point Field Formatters
84+
=== Geographic point field formatters
8585

8686
Geographic point fields support the `String` formatter.
8787

8888
include::field-formatters/string-formatter.asciidoc[]
8989

9090
[[field-formatters-numeric]]
91-
=== Numeric Field Formatters
91+
=== Numeric field formatters
9292

9393
Numeric fields support the `Url`, `Bytes`, `Duration`, `Number`, `Percentage`, `String`, and `Color` formatters.
9494

9595
The `Bytes`, `Number`, and `Percentage` formatters enable you to choose the display formats of numbers in this field using
96-
the <<numeral, Elastic numeral pattern>> syntax that Kibana maintains.
96+
the <<numeral, Elastic numeral pattern>> syntax that {kib} maintains.
9797

9898
include::field-formatters/url-formatter.asciidoc[]
9999

@@ -104,70 +104,63 @@ include::field-formatters/duration-formatter.asciidoc[]
104104
include::field-formatters/color-formatter.asciidoc[]
105105

106106
[[scripted-fields]]
107-
=== Scripted Fields
107+
=== Scripted fields
108108

109-
Scripted fields compute data on the fly from the data in your Elasticsearch indices. Scripted field data is shown on
110-
the Discover tab as part of the document data, and you can use scripted fields in your visualizations.
111-
Scripted field values are computed at query time so they aren't indexed and cannot be searched using Kibana's default
112-
query language. However they can be queried using Kibana's new <<kuery-query, experimental query language>>. Scripted
113-
fields are also supported in the filter bar.
109+
Scripted fields compute data on the fly from the data in your {es} indices. The data is shown on
110+
the Discover tab as part of the document data, and you can use scripted fields in your visualizations. You query scripted fields with the <<kuery-query, {kib} query language>>, and can filter them using the filter bar. The scripted field values are computed at query time, so they aren't indexed and cannot be searched using the {kib} default
111+
query language.
114112

115113
WARNING: Computing data on the fly with scripted fields can be very resource intensive and can have a direct impact on
116-
Kibana's performance. Keep in mind that there's no built-in validation of a scripted field. If your scripts are
114+
{kib} performance. Keep in mind that there's no built-in validation of a scripted field. If your scripts are
117115
buggy, you'll get exceptions whenever you try to view the dynamically generated data.
118116

119-
When you define a scripted field in Kibana, you have a choice of scripting languages. Starting with 5.0, the default
117+
When you define a scripted field in {kib}, you have a choice of scripting languages. In 5.0 and later, the default
120118
options are {ref}/modules-scripting-expression.html[Lucene expressions] and {ref}/modules-scripting-painless.html[Painless].
121-
While you can use other scripting languages if you enable dynamic scripting for them in Elasticsearch, this is not recommended
119+
While you can use other scripting languages if you enable dynamic scripting for them in {es}, this is not recommended
122120
because they cannot be sufficiently {ref}/modules-scripting-security.html[sandboxed].
123121

124-
WARNING: Use of Groovy, JavaScript, and Python scripting is deprecated starting in Elasticsearch 5.0, and support for those
125-
scripting languages will be removed in the future.
122+
WARNING: In 5.0 and later, Groovy, JavaScript, and Python scripting are deprecated and unsupported.
126123

127124
You can reference any single value numeric field in your expressions, for example:
128125

129126
----
130127
doc['field_name'].value
131128
----
132129

133-
For more background on scripted fields and additional examples, refer to this blog:
134-
https://www.elastic.co/blog/using-painless-kibana-scripted-fields[Using Painless in Kibana scripted fields]
130+
For more information on scripted fields and additional examples, refer to
131+
https://www.elastic.co/blog/using-painless-kibana-scripted-fields[Using Painless in {kib} scripted fields]
135132

136133
[float]
137134
[[create-scripted-field]]
138-
=== Creating a Scripted Field
139-
To create a scripted field:
135+
=== Create a scripted field
140136

141-
. Go to *Management > Kibana > Index Patterns*
137+
. Go to *Management > {kib} > Index Patterns*
142138
. Select the index pattern you want to add a scripted field to.
143-
. Go to the pattern's *Scripted fields* tab.
144-
. Click *Add scripted field*.
139+
. Go to the *Scripted fields* tab for the index pattern, then click *Add scripted field*.
145140
. Enter a name for the scripted field.
146141
. Enter the expression that you want to use to compute a value on the fly from your index data.
147142
. Click *Create field*.
148143

149-
For more information about scripted fields in Elasticsearch, see
144+
For more information about scripted fields in {es}, see
150145
{ref}/modules-scripting.html[Scripting].
151146

152147
[float]
153148
[[update-scripted-field]]
154-
=== Updating a Scripted Field
155-
To modify a scripted field:
149+
=== Update a scripted field
156150

157-
. Go to *Management > Kibana > Index Patterns*
158-
. Click the index pattern's *Scripted fields* tab.
151+
. Go to *Management > {kib} > Index Patterns*
152+
. Click the *Scripted fields* tab for the index pattern.
159153
. Click the *Edit* button for the scripted field you want to change.
160-
. Make your changes and then click *Save field* to update the field.
154+
. Make your changes, then click *Save field*.
161155

162-
WARNING: Keep in mind that there's no built-in validation of a scripted field. If your scripts are buggy, you'll get
156+
WARNING: Built-in validation is unsupported for scripted fields. If your scripts are buggy, you'll get
163157
exceptions whenever you try to view the dynamically generated data.
164158

165159
[float]
166160
[[delete-scripted-field]]
167-
=== Deleting a Scripted Field
168-
To delete a scripted field:
161+
=== Delete a scripted field
169162

170-
. Go to *Management > Kibana > Index Patterns*
171-
. Click the index pattern's *Scripted fields* tab.
172-
. Click the *Delete* button for the scripted field you want to remove.
173-
. Click *Delete* in the confirmation window.
163+
. Go to *Management > {kib} > Index Patterns*
164+
. Click the *Scripted fields* tab for the index pattern.
165+
. Click *Delete* for the scripted field you want to remove.
166+
. Click *Delete* on the confirmation window.

docs/redirects.asciidoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,9 @@ This page has moved. Please see <<get-data-in>>.
6464
[role="exclude",id="tilemap"]
6565
== Coordinate map
6666

67-
This page has moved. Please see <<coordinate-map>>.
67+
This page has moved. Please see <<maps>>.
68+
69+
[role="exclude",id="visualize-maps"]
70+
== Maps
71+
72+
This page has moved. Please see <<maps>>.

docs/setup/settings.asciidoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,15 +220,13 @@ requests. Supported on Elastic Cloud Enterprise.
220220
`map.includeElasticMapsService:`:: *Default: true*
221221
Set to false to disable connections to Elastic Maps Service.
222222
When `includeElasticMapsService` is turned off, only the vector layers configured by `map.regionmap`
223-
and the tile layer configured by `map.tilemap.url` will be available in the <<maps, Maps application>>,
224-
<<tilemap, Coordinate map visualizations>>, and <<visualize-maps, Region map visualizations>>.
223+
and the tile layer configured by `map.tilemap.url` will be available in <<maps, Maps>>.
225224

226225
`map.proxyElasticMapsServiceInMaps:`:: *Default: false*
227226
Set to true to proxy all <<maps, Maps application>> Elastic Maps Service requests through the Kibana server.
228-
This setting does not impact <<tilemap, Coordinate map visualizations>> and <<visualize-maps, Region map visualizations>>.
229227

230228
[[regionmap-settings]] `map.regionmap:`:: Specifies additional vector layers for
231-
use in <<visualize-maps, Region Map>> visualizations. Supported on {ece}. Each layer
229+
use in <<maps, Maps>> visualizations. Supported on {ece}. Each layer
232230
object points to an external vector file that contains a geojson
233231
FeatureCollection. The file must use the
234232
https://en.wikipedia.org/wiki/World_Geodetic_System[WGS84 coordinate reference system (ESPG:4326)]

docs/user/visualize.asciidoc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ data sets.
4040
<<visualize-maps, Maps>>::
4141
* *<<maps,Elastic Maps>>* &mdash; Displays geospatial data in {kib}.
4242

43-
* *Coordinate map* &mdash; Displays points on a map using a geohash aggregation.
44-
45-
* *Region map* &mdash; Merges any structured map data onto a shape.
46-
47-
* *Heat map* &mdash; Displays shaded cells within a matrix.
43+
* <<heat-map,Heat map>>:: Display shaded cells within a matrix.
4844

4945
<<for-dashboard,Dashboard tools>>::
5046

docs/visualize/tilemap.asciidoc

Lines changed: 4 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,14 @@
1-
[[visualize-maps]]
2-
== Maps
3-
4-
To tell a story and answer questions about your geographical data, you can create several types of interactive maps with Visualize.
5-
6-
Visualize supports the following maps:
7-
8-
* *Coordinate* &mdash; Display latitude and longitude coordinates that are associated to the specified bucket aggregation.
9-
10-
* *Region* &mdash; Display colored boundary vector shapes using a gradient. Darker colors indicate larger values, and lighter colors indicate smaller values.
11-
12-
* *Heat* &mdash; Display graphical representations of data where the individual values are represented by colors.
13-
14-
NOTE: The maps in Visualize have been replaced with <<maps>>, which offers more functionality.
15-
16-
[float]
17-
[[coordinate-map]]
18-
=== Coordinate map
19-
20-
Use a coordinate map when your data set includes latitude and longitude values. For example, use a coordinate map to see the varying popularity of destination airports using the sample flight data.
21-
22-
[role="screenshot"]
23-
image::images/visualize_coordinate_map_example.png[]
24-
25-
[float]
26-
[[build-coordinate-map]]
27-
==== Build a coordinate map
28-
29-
Configure the `kibana.yml` settings and add the aggregations.
30-
31-
. Configure the following `kibana.yml` settings:
32-
33-
* Set `xpack.maps.showMapVisualizationTypes` to `true`.
34-
35-
* To use a tile service provider for coordinate maps other than https://www.elastic.co/elastic-maps-service[Elastic Maps Service], configure the <<tilemap-settings,tilemap settings>>.
36-
37-
. To display your data on the coordinate map, use the following aggregations:
38-
39-
* <<visualize-metric-aggregations,Metric>>
40-
41-
* <<visualize-bucket-aggregations,Geohash bucket aggregation>>
42-
43-
. Specify the geohash bucket aggregation options:
44-
45-
* *Precision* slider &mdash; Determines the granularity of the results displayed on the map. To show the *Precision* slider, deselect *Change precision on map zoom*. For information on the area specified by each precision level, refer to {ref}/search-aggregations-bucket-geohashgrid-aggregation.html#_cell_dimensions_at_the_equator[geohash grid].
46-
+
47-
NOTE: Higher precisions increase memory usage for the browser that displays {kib} and the underlying
48-
{es} cluster.
49-
50-
* *Place markers off grid (use {ref}/search-aggregations-metrics-geocentroid-aggregation.html[geocentroid])* &mdash; When you selected, the markers are
51-
placed in the center of all documents in the bucket, and a more accurate visualization is created. When deselected, the markers are placed in the center
52-
of the geohash grid cell.
53-
+
54-
NOTE: When you have multiple values in the geo_point, the coordinate map is unable to accurately calculate the geo_centroid.
55-
56-
[float]
57-
[[navigate-coordinate-map]]
58-
==== Navigate the coordinate map
59-
60-
To navigate the coordinate map, use the navigation options.
61-
62-
* To move the map center, click and hold anywhere on the map and move the cursor.
63-
64-
* To change the zoom level, click *Zoom In* or *Zoom out* image:images/viz-zoom.png[].
65-
66-
* To automatically crop the map boundaries to the
67-
geohash buckets that have at least one result, click *Fit Data Bounds* image:images/viz-fit-bounds.png[].
68-
69-
[float]
70-
[[region-map]]
71-
=== Region map
72-
73-
Use region maps when you want to show statistical data on a geographic area, such as a county, country, province, or state. For example, use a region map if you want to see the average sales for each country with the sample eCommerce order data.
74-
75-
[role="screenshot"]
76-
image::images/visualize_region_map_example.png[]
77-
78-
[float]
79-
[[build-region-maps]]
80-
==== Build a region map
81-
82-
Configure the `kibana.yml` settings and add the aggregations.
83-
84-
. In `kibana.yml`, set `xpack.maps.showMapVisualizationTypes` to `true`.
85-
86-
. To display your data on the region map, use the following aggregations:
87-
88-
* <<visualize-metric-aggregations,Metric>>
89-
* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
90-
* <<visualize-bucket-aggregations,Terms bucket aggregation>>
91-
92-
[float]
93-
[[navigate-region-map]]
94-
==== Navigate the region map
95-
96-
To navigate the region map, use the navigation options.
97-
98-
* To change the zoom level, click *Zoom In* or *Zoom out* image:images/viz-zoom.png[].
99-
100-
* To automatically crop the map boundaries, click *Fit Data Bounds* image:images/viz-fit-bounds.png[].
101-
102-
[float]
1031
[[heat-map]]
104-
=== Heat map
2+
== Heat map
1053

106-
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.
4+
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.
1075

1086
[role="screenshot"]
1097
image::images/visualize_heat_map_example.png[]
1108

1119
[float]
11210
[[build-heat-map]]
113-
==== Build a heat map
11+
=== Build a heat map
11412

11513
To display your data on the heat map, use the supported aggregations.
11614

@@ -123,7 +21,7 @@ Heat maps support the following aggregations:
12321

12422
[float]
12523
[[navigate-heatmap]]
126-
==== Change the color ranges
24+
=== Change the color ranges
12725

12826
When only one color displays on the heat map, you might need to change the color ranges.
12927

0 commit comments

Comments
 (0)