Skip to content

Commit fca8229

Browse files
Merge branch 'master' into uptime_server-new-platform
2 parents c654473 + 9758d69 commit fca8229

File tree

223 files changed

+4781
-4414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+4781
-4414
lines changed

.github/CODEOWNERS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
/src/dev/ @elastic/kibana-operations
4444
/src/setup_node_env/ @elastic/kibana-operations
4545
/src/optimize/ @elastic/kibana-operations
46+
/packages/*eslint*/ @elastic/kibana-operations
47+
/packages/*babel*/ @elastic/kibana-operations
48+
/packages/kbn-dev-utils*/ @elastic/kibana-operations
49+
/packages/kbn-es/ @elastic/kibana-operations
50+
/packages/kbn-pm/ @elastic/kibana-operations
51+
/packages/kbn-test/ @elastic/kibana-operations
4652

4753
# Platform
4854
/src/core/ @elastic/kibana-platform
@@ -81,6 +87,9 @@
8187
/x-pack/legacy/plugins/rollup/ @elastic/es-ui
8288
/x-pack/legacy/plugins/searchprofiler/ @elastic/es-ui
8389
/x-pack/legacy/plugins/snapshot_restore/ @elastic/es-ui
90+
# ML team owns the transform plugin, ES team added here for visibility
91+
# because the plugin lives in Kibana's Elasticsearch management section.
92+
/x-pack/legacy/plugins/transform/ @elastic/es-ui
8493
/x-pack/legacy/plugins/watcher/ @elastic/es-ui
8594

8695
# Kibana TSVB external contractors

.i18nrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"paths": {
33
"common.ui": "src/legacy/ui",
4-
"data": "src/legacy/core_plugins/data",
4+
"data": ["src/legacy/core_plugins/data", "src/plugins/data"],
55
"expressions": "src/legacy/core_plugins/expressions",
66
"kibana_react": "src/legacy/core_plugins/kibana_react",
77
"server": "src/legacy/server",

NOTICE.txt

Lines changed: 66 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,55 @@
11
Kibana source code with Kibana X-Pack source code
22
Copyright 2012-2019 Elasticsearch B.V.
33

4+
---
5+
Pretty handling of logarithmic axes.
6+
Copyright (c) 2007-2014 IOLA and Ole Laursen.
7+
Licensed under the MIT license.
8+
Created by Arne de Laat
9+
Set axis.mode to "log" and make the axis logarithmic using transform:
10+
axis: {
11+
mode: 'log',
12+
transform: function(v) {v <= 0 ? Math.log(v) / Math.LN10 : null},
13+
inverseTransform: function(v) {Math.pow(10, v)}
14+
}
15+
The transform filters negative and zero values, because those are
16+
invalid on logarithmic scales.
17+
This plugin tries to create good looking logarithmic ticks, using
18+
unicode superscript characters. If all data to be plotted is between two
19+
powers of ten then the default flot tick generator and renderer are
20+
used. Logarithmic ticks are places at powers of ten and at half those
21+
values if there are not to many ticks already (e.g. [1, 5, 10, 50, 100]).
22+
For details, see https://github.com/flot/flot/pull/1328
23+
424
---
525
This product has relied on ASTExplorer that is licensed under MIT.
626

27+
---
28+
This product includes code that is based on flot-charts, which was available
29+
under a "MIT" license.
30+
31+
The MIT License (MIT)
32+
33+
Copyright (c) 2007-2014 IOLA and Ole Laursen
34+
35+
Permission is hereby granted, free of charge, to any person obtaining a copy
36+
of this software and associated documentation files (the "Software"), to deal
37+
in the Software without restriction, including without limitation the rights
38+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
39+
copies of the Software, and to permit persons to whom the Software is
40+
furnished to do so, subject to the following conditions:
41+
42+
The above copyright notice and this permission notice shall be included in
43+
all copies or substantial portions of the Software.
44+
45+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
46+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
47+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
48+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
49+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
50+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
51+
THE SOFTWARE.
52+
753
---
854
This product uses Noto fonts that are licensed under the SIL Open
955
Font License, Version 1.1.
@@ -34,26 +80,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
3480
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3581
SOFTWARE.
3682

37-
---
38-
Pretty handling of logarithmic axes.
39-
Copyright (c) 2007-2014 IOLA and Ole Laursen.
40-
Licensed under the MIT license.
41-
Created by Arne de Laat
42-
Set axis.mode to "log" and make the axis logarithmic using transform:
43-
axis: {
44-
mode: 'log',
45-
transform: function(v) {v <= 0 ? Math.log(v) / Math.LN10 : null},
46-
inverseTransform: function(v) {Math.pow(10, v)}
47-
}
48-
The transform filters negative and zero values, because those are
49-
invalid on logarithmic scales.
50-
This plugin tries to create good looking logarithmic ticks, using
51-
unicode superscript characters. If all data to be plotted is between two
52-
powers of ten then the default flot tick generator and renderer are
53-
used. Logarithmic ticks are places at powers of ten and at half those
54-
values if there are not to many ticks already (e.g. [1, 5, 10, 50, 100]).
55-
For details, see https://github.com/flot/flot/pull/1328
56-
5783
---
5884
This product bundles [email protected] which is available under a
5985
"MIT" license.
@@ -107,6 +133,26 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
107133
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
108134
THE SOFTWARE.
109135

136+
---
137+
This product bundles code based on [email protected] which is
138+
available under a "MIT" license.
139+
140+
ISC License
141+
142+
Copyright (c) 2017 Brandon Keepers
143+
144+
Permission to use, copy, modify, and/or distribute this software for any
145+
purpose with or without fee is hereby granted, provided that the above
146+
copyright notice and this permission notice appear in all copies.
147+
148+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
149+
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
150+
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
151+
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
152+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
153+
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
154+
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
155+
110156
---
111157
This product includes code that is adapted from mapbox-gl-js, which is
112158
available under a "BSD-3-Clause" license.
@@ -166,32 +212,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
166212
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
167213
SOFTWARE.
168214

169-
---
170-
This product includes code that is based on flot-charts, which was available
171-
under a "MIT" license.
172-
173-
The MIT License (MIT)
174-
175-
Copyright (c) 2007-2014 IOLA and Ole Laursen
176-
177-
Permission is hereby granted, free of charge, to any person obtaining a copy
178-
of this software and associated documentation files (the "Software"), to deal
179-
in the Software without restriction, including without limitation the rights
180-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
181-
copies of the Software, and to permit persons to whom the Software is
182-
furnished to do so, subject to the following conditions:
183-
184-
The above copyright notice and this permission notice shall be included in
185-
all copies or substantial portions of the Software.
186-
187-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
188-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
189-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
190-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
191-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
192-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
193-
THE SOFTWARE.
194-
195215
---
196216
This product includes code that was extracted from [email protected].
197217
Original license:
576 KB
Loading
598 KB
Loading

docs/maps/search.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ A spatial filter narrows search results to documents that either intersect with,
3939
You can create spatial filters in two ways:
4040

4141
* Click the tool icon image:maps/images/tools_icon.png[], and then draw a polygon or bounding box on the map to define the spatial filter.
42-
* Click *Filter by geometry* in a tooltip, and then use the feature's geometry for the spatial filter.
42+
* Click *Filter by geometry* in a <<maps-vector-tooltip-locking, locked tooltip>>, and then use the feature's geometry for the spatial filter.
4343
+
4444
[role="screenshot"]
4545
image::maps/images/create_spatial_filter.png[]
@@ -55,7 +55,7 @@ Spatial filters have the following properties:
5555
==== Phrase filters
5656

5757
A phrase filter narrows search results to documents that contain the specified text.
58-
You can create a phrase filter by clicking the plus icon image:maps/images/gs_plus_icon.png[] in a feature tooltip.
58+
You can create a phrase filter by clicking the plus icon image:maps/images/gs_plus_icon.png[] in a <<maps-vector-tooltip-locking, locked tooltip>>.
5959

6060
[role="screenshot"]
6161
image::maps/images/create_phrase_filter.png[]

docs/maps/vector-layer.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ The index must contain at least 2 fields mapped as {ref}/geo-point.html[geo_poin
2929

3030
include::vector-style.asciidoc[]
3131
include::vector-style-properties.asciidoc[]
32+
include::vector-tooltips.asciidoc[]

docs/maps/vector-tooltips.asciidoc

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
[role="xpack"]
2+
[[vector-tooltip]]
3+
=== Vector tooltips
4+
Vector tooltips display attributes for the features at your mouse location.
5+
These tooltips give users an in-depth insight into what's going on in the map.
6+
7+
If more than one feature exists at a location, the tooltip displays the
8+
attributes for the top feature, and notes the number of features at that location.
9+
The following image shows a tooltip with three features at the current location.
10+
The tooltip displays attributes for the top feature, the green circle.
11+
12+
[role="screenshot"]
13+
image::maps/images/multifeature_tooltip.png[]
14+
15+
[float]
16+
[[maps-vector-tooltip-formatting]]
17+
18+
==== Formatting tooltips
19+
20+
You can format the attributes in a tooltip by adding <<managing-fields, field formatters>> to your
21+
Kibana index pattern. You can use field formatters to round numbers, provide units,
22+
and even display images in your tooltip.
23+
24+
[float]
25+
[[maps-vector-tooltip-locking]]
26+
==== Locking a tooltip at the current location
27+
You can lock a tooltip in place by clicking a location on the map.
28+
With locked tooltips you can:
29+
30+
* Page through features.
31+
* Create a <<maps-phrase-filter, phrase filter>> from a feature attribute value.
32+
* Create a <<maps-spatial-filters, spatial filter>> from a feature's geometry.
33+
34+
This image shows a locked tooltip with features from three layers.
35+
The tooltip displays attributes
36+
for the second feature, the blue New York State polygon. The tooltip includes
37+
controls for paging through the features and a dropdown menu for filtering
38+
the features by layer.
39+
40+
[role="screenshot"]
41+
image::maps/images/locked_tooltip.png[]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@
360360
"babel-jest": "^24.9.0",
361361
"babel-plugin-dynamic-import-node": "^2.3.0",
362362
"babel-plugin-istanbul": "^5.2.0",
363-
"backport": "4.7.3",
363+
"backport": "4.8.0",
364364
"chai": "3.5.0",
365365
"chance": "1.0.18",
366366
"cheerio": "0.22.0",

packages/kbn-babel-code-parser/src/visitors.js

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,8 @@
1-
/*
2-
* Licensed to Elasticsearch B.V. under one or more contributor
3-
* license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright
5-
* ownership. Elasticsearch B.V. licenses this file to you under
6-
* the Apache License, Version 2.0 (the "License"); you may
7-
* not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
18-
*/
1+
/* eslint-disable @kbn/eslint/require-license-header */
192

203
import { matches } from 'lodash';
214

22-
/**
23-
* @notice
5+
/* @notice
246
*
257
* This product has relied on ASTExplorer that is licensed under MIT.
268
*/

0 commit comments

Comments
 (0)