Skip to content

Commit a5b00a6

Browse files
darnautovdarnautov
committed
Merge remote-tracking branch 'upstream/master' into ML-63700-job-validation
2 parents bc42c90 + a149915 commit a5b00a6

609 files changed

Lines changed: 5083 additions & 4119 deletions

File tree

Some content is hidden

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

‎.sass-lint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ files:
1111
- 'x-pack/plugins/cross_cluster_replication/**/*.s+(a|c)ss'
1212
- 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
1313
- 'x-pack/plugins/maps/**/*.s+(a|c)ss'
14+
- 'x-pack/plugins/spaces/**/*.s+(a|c)ss'
1415
ignore:
1516
- 'x-pack/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
1617
rules:

‎CONTRIBUTING.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,34 @@ extract them to a `JSON` file or integrate translations back to Kibana. To know
414414
We cannot support accepting contributions to the translations from any source other than the translators we have engaged to do the work.
415415
We are still to develop a proper process to accept any contributed translations. We certainly appreciate that people care enough about the localization effort to want to help improve the quality. We aim to build out a more comprehensive localization process for the future and will notify you once contributions can be supported, but for the time being, we are not able to incorporate suggestions.
416416

417+
### Syling with SASS
418+
419+
When writing a new component, create a sibling SASS file of the same name and import directly into the JS/TS component file. Doing so ensures the styles are never separated or lost on import and allows for better modularization (smaller individual plugin asset footprint).
420+
421+
Any JavaScript (or TypeScript) file that imports SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass) & Kibana invisibles (SASS variables, mixins, functions) from the [`styling_constants.scss` file](https://github.com/elastic/kibana/blob/master/src/legacy/ui/public/styles/_styling_constants.scss). However, any Legacy (file path includes `/legacy`) files will not.
422+
423+
**Example:**
424+
425+
```tsx
426+
// component.tsx
427+
428+
import './component.scss';
429+
430+
export const Component = () => {
431+
return (
432+
<div className="plgComponent" />
433+
);
434+
}
435+
```
436+
437+
```scss
438+
// component.scss
439+
440+
.plgComponent { ... }
441+
```
442+
443+
Do not use the underscore `_` SASS file naming pattern when importing directly into a javascript file.
444+
417445
### Testing and Building
418446

419447
To ensure that your changes will not break other functionality, please run the test suite and build process before submitting your Pull Request.

‎docs/api/features.asciidoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The API returns the following:
2929
"id": "discover",
3030
"name": "Discover",
3131
"icon": "discoverApp",
32-
"navLinkId": "kibana:discover",
32+
"navLinkId": "discover",
3333
"app": [
3434
"kibana"
3535
],
@@ -74,7 +74,7 @@ The API returns the following:
7474
"id": "visualize",
7575
"name": "Visualize",
7676
"icon": "visualizeApp",
77-
"navLinkId": "kibana:visualize",
77+
"navLinkId": "visualize",
7878
"app": [
7979
"kibana"
8080
],
@@ -121,7 +121,7 @@ The API returns the following:
121121
"id": "dashboard",
122122
"name": "Dashboard",
123123
"icon": "dashboardApp",
124-
"navLinkId": "kibana:dashboard",
124+
"navLinkId": "dashboards",
125125
"app": [
126126
"kibana"
127127
],
@@ -173,7 +173,7 @@ The API returns the following:
173173
"id": "dev_tools",
174174
"name": "Dev Tools",
175175
"icon": "devToolsApp",
176-
"navLinkId": "kibana:dev_tools",
176+
"navLinkId": "dev_tools",
177177
"app": [
178178
"kibana"
179179
],

‎docs/developer/plugin/development-plugin-feature-registration.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ init(server) {
153153
defaultMessage: 'Dev Tools',
154154
}),
155155
icon: 'devToolsApp',
156-
navLinkId: 'kibana:dev_tools',
156+
navLinkId: 'dev_tools',
157157
app: ['kibana'],
158158
catalogue: ['console', 'searchprofiler', 'grokdebugger'],
159159
privileges: {
@@ -216,7 +216,7 @@ init(server) {
216216
}),
217217
order: 100,
218218
icon: 'discoverApp',
219-
navLinkId: 'kibana:discover',
219+
navLinkId: 'discover',
220220
app: ['kibana'],
221221
catalogue: ['discover'],
222222
privileges: {

‎docs/maps/heatmap-layer.asciidoc‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22
[[heatmap-layer]]
33
== Heat map layer
44

5-
In the heat map layer, point data is clustered to show locations with higher densities.
5+
Heat map layers cluster point data to show locations with higher densities.
66

77
[role="screenshot"]
88
image::maps/images/heatmap_layer.png[]
99

10-
You can create a heat map layer from the following data source:
11-
12-
*Grid aggregation*:: Geospatial data grouped in grids with metrics for each gridded cell.
13-
Set *Show as* to *heat map*.
10+
To add a heat map layer to your map, click *Add layer*, then select the *Heat map* layer.
1411
The index must contain at least one field mapped as {ref}/geo-point.html[geo_point].
1512

1613
NOTE: Only count, sum, unique count metric aggregations are available with the grid aggregation source and heat map layers.

‎docs/maps/images/heatmap_layer.png‎

58.1 KB
Loading

‎docs/maps/images/spatial_filters.png‎

504 KB
Loading

‎docs/maps/images/tile_layer.png‎

-255 KB
Loading

‎docs/maps/images/vector_layer.png‎

11.2 KB
Loading

‎docs/maps/index.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ include::tile-layer.asciidoc[]
3030
include::vector-layer.asciidoc[]
3131
include::maps-aggregations.asciidoc[]
3232
include::search.asciidoc[]
33+
include::map-settings.asciidoc[]
3334
include::connect-to-ems.asciidoc[]
3435
include::geojson-upload.asciidoc[]
3536
include::indexing-geojson-data-tutorial.asciidoc[]

0 commit comments

Comments
 (0)