Skip to content

Commit 358fca7

Browse files
Merge branch 'master' into 89024-fix-host-overview-boxes
2 parents d827ce5 + 64e9cf0 commit 358fca7

282 files changed

Lines changed: 7666 additions & 5107 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.

.github/CODEOWNERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
/src/plugins/advanced_settings/ @elastic/kibana-app
1414
/src/plugins/charts/ @elastic/kibana-app
1515
/src/plugins/discover/ @elastic/kibana-app
16-
/src/plugins/lens_oss/ @elastic/kibana-app
1716
/src/plugins/management/ @elastic/kibana-app
1817
/src/plugins/kibana_legacy/ @elastic/kibana-app
1918
/src/plugins/timelion/ @elastic/kibana-app
@@ -127,7 +126,6 @@
127126
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
128127
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
129128
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
130-
#CC# /src/plugins/maps_oss/ @elastic/kibana-gis
131129
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
132130
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
133131
/src/plugins/tile_map/ @elastic/kibana-gis

.i18nrc.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@
6161
"visTypeVislib": "src/plugins/vis_type_vislib",
6262
"visTypeXy": "src/plugins/vis_type_xy",
6363
"visualizations": "src/plugins/visualizations",
64-
"lensOss": "src/plugins/lens_oss",
65-
"mapsOss": "src/plugins/maps_oss",
6664
"visualize": "src/plugins/visualize",
6765
"apmOss": "src/plugins/apm_oss",
6866
"usageCollection": "src/plugins/usage_collection"

docs/developer/plugin-list.asciidoc

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,6 @@ in Kibana, e.g. visualizations. It has the form of a flyout panel.
130130
|The legacyExport plugin adds support for the legacy saved objects export format.
131131
132132
133-
|{kib-repo}blob/{branch}/src/plugins/lens_oss/README.md[lensOss]
134-
|The lens_oss plugin registers the lens visualization on OSS.
135-
It is registered as disabled. The x-pack plugin should unregister this.
136-
137-
138133
|{kib-repo}blob/{branch}/src/plugins/management/README.md[management]
139134
|This plugins contains the "Stack Management" page framework. It offers navigation and an API
140135
to link individual managment section into it. This plugin does not contain any individual
@@ -145,11 +140,6 @@ management section itself.
145140
|Internal objects used by the Coordinate, Region, and Vega visualizations.
146141
147142
148-
|{kib-repo}blob/{branch}/src/plugins/maps_oss/README.md[mapsOss]
149-
|The maps_oss plugin registers the maps visualization on OSS.
150-
It is registered as disabled. The x-pack plugin should unregister this.
151-
152-
153143
|{kib-repo}blob/{branch}/src/plugins/navigation/README.md[navigation]
154144
|The navigation plugins exports the TopNavMenu component.
155145
It also provides a stateful version of it on the start contract.
@@ -380,10 +370,6 @@ and actions.
380370
|The features plugin enhance Kibana with a per-feature privilege system.
381371
382372
383-
|{kib-repo}blob/{branch}/x-pack/plugins/file_upload/README.md[fileUpload]
384-
|Backend and core front-end react-components for GeoJson file upload. Only supports the Maps plugin.
385-
386-
387373
|{kib-repo}blob/{branch}/x-pack/plugins/fleet/README.md[fleet]
388374
|Fleet needs to have Elasticsearch API keys enabled, and also to have TLS enabled on kibana, (if you want to run Kibana without TLS you can provide the following config flag --xpack.fleet.agents.tlsCheckDisabled=false)
389375
@@ -453,6 +439,10 @@ using the CURL scripts in the scripts folder.
453439
|Visualize geo data from Elasticsearch or 3rd party geo-services.
454440
455441
442+
|{kib-repo}blob/{branch}/x-pack/plugins/maps_file_upload/README.md[mapsFileUpload]
443+
|Deprecated - plugin targeted for removal and will get merged into file_upload plugin
444+
445+
456446
|{kib-repo}blob/{branch}/x-pack/plugins/maps_legacy_licensing/README.md[mapsLegacyLicensing]
457447
|This plugin provides access to the detailed tile map services from Elastic.
458448

docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Set of helpers used to create `KibanaResponse` to form HTTP response on an incom
1010

1111
```typescript
1212
kibanaResponseFactory: {
13-
custom: <T extends string | Error | Buffer | Stream | Record<string, any> | {
13+
custom: <T extends string | Record<string, any> | Buffer | Error | Stream | {
1414
message: string | Error;
1515
attributes?: Record<string, any> | undefined;
1616
} | undefined>(options: CustomHttpResponseOptions<T>) => KibanaResponse<T>;
@@ -21,9 +21,9 @@ kibanaResponseFactory: {
2121
conflict: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
2222
internalError: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
2323
customError: (options: CustomHttpResponseOptions<ResponseError>) => KibanaResponse<ResponseError>;
24-
redirected: (options: RedirectResponseOptions) => KibanaResponse<string | Buffer | Stream | Record<string, any>>;
25-
ok: (options?: HttpResponseOptions) => KibanaResponse<string | Buffer | Stream | Record<string, any>>;
26-
accepted: (options?: HttpResponseOptions) => KibanaResponse<string | Buffer | Stream | Record<string, any>>;
24+
redirected: (options: RedirectResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
25+
ok: (options?: HttpResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
26+
accepted: (options?: HttpResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
2727
noContent: (options?: HttpResponseOptions) => KibanaResponse<undefined>;
2828
}
2929
```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs._constructor_.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ constructor(indexPattern: IndexPattern, configStates: Pick<Pick<{
1515
id?: string | undefined;
1616
params?: {} | import("./agg_config").SerializableState | undefined;
1717
schema?: string | undefined;
18-
}, "enabled" | "schema" | "id" | "params"> & Pick<{
18+
}, "schema" | "enabled" | "id" | "params"> & Pick<{
1919
type: string | IAggType;
2020
}, "type"> & Pick<{
2121
type: string | IAggType;
22-
}, never>, "enabled" | "type" | "schema" | "id" | "params">[] | undefined, opts: AggConfigsOptions);
22+
}, never>, "schema" | "type" | "enabled" | "id" | "params">[] | undefined, opts: AggConfigsOptions);
2323
```
2424

2525
## Parameters
2626

2727
| Parameter | Type | Description |
2828
| --- | --- | --- |
2929
| indexPattern | <code>IndexPattern</code> | |
30-
| configStates | <code>Pick&lt;Pick&lt;{</code><br/><code> type: string;</code><br/><code> enabled?: boolean &#124; undefined;</code><br/><code> id?: string &#124; undefined;</code><br/><code> params?: {} &#124; import(&quot;./agg_config&quot;).SerializableState &#124; undefined;</code><br/><code> schema?: string &#124; undefined;</code><br/><code> }, &quot;enabled&quot; &#124; &quot;schema&quot; &#124; &quot;id&quot; &#124; &quot;params&quot;&gt; &amp; Pick&lt;{</code><br/><code> type: string &#124; IAggType;</code><br/><code> }, &quot;type&quot;&gt; &amp; Pick&lt;{</code><br/><code> type: string &#124; IAggType;</code><br/><code> }, never&gt;, &quot;enabled&quot; &#124; &quot;type&quot; &#124; &quot;schema&quot; &#124; &quot;id&quot; &#124; &quot;params&quot;&gt;[] &#124; undefined</code> | |
30+
| configStates | <code>Pick&lt;Pick&lt;{</code><br/><code> type: string;</code><br/><code> enabled?: boolean &#124; undefined;</code><br/><code> id?: string &#124; undefined;</code><br/><code> params?: {} &#124; import(&quot;./agg_config&quot;).SerializableState &#124; undefined;</code><br/><code> schema?: string &#124; undefined;</code><br/><code> }, &quot;schema&quot; &#124; &quot;enabled&quot; &#124; &quot;id&quot; &#124; &quot;params&quot;&gt; &amp; Pick&lt;{</code><br/><code> type: string &#124; IAggType;</code><br/><code> }, &quot;type&quot;&gt; &amp; Pick&lt;{</code><br/><code> type: string &#124; IAggType;</code><br/><code> }, never&gt;, &quot;schema&quot; &#124; &quot;type&quot; &#124; &quot;enabled&quot; &#124; &quot;id&quot; &#124; &quot;params&quot;&gt;[] &#124; undefined</code> | |
3131
| opts | <code>AggConfigsOptions</code> | |
3232

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<b>Signature:</b>
88

99
```typescript
10-
SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "intl" | "indexPatterns" | "dataTestSubj" | "refreshInterval" | "screenTitle" | "onRefresh" | "onRefreshChange" | "showQueryInput" | "showDatePicker" | "showAutoRefreshOnly" | "dateRangeFrom" | "dateRangeTo" | "isRefreshPaused" | "customSubmitButton" | "timeHistory" | "indicateNoData" | "onFiltersUpdated" | "trackUiMetric" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "showQueryBar" | "showFilterBar" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated">, "query" | "isLoading" | "filters" | "indexPatterns" | "dataTestSubj" | "refreshInterval" | "screenTitle" | "onRefresh" | "onRefreshChange" | "showQueryInput" | "showDatePicker" | "showAutoRefreshOnly" | "dateRangeFrom" | "dateRangeTo" | "isRefreshPaused" | "customSubmitButton" | "timeHistory" | "indicateNoData" | "onFiltersUpdated" | "trackUiMetric" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "showQueryBar" | "showFilterBar" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated">, any> & {
11-
WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "intl" | "indexPatterns" | "dataTestSubj" | "refreshInterval" | "screenTitle" | "onRefresh" | "onRefreshChange" | "showQueryInput" | "showDatePicker" | "showAutoRefreshOnly" | "dateRangeFrom" | "dateRangeTo" | "isRefreshPaused" | "customSubmitButton" | "timeHistory" | "indicateNoData" | "onFiltersUpdated" | "trackUiMetric" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "showQueryBar" | "showFilterBar" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated"> & ReactIntl.InjectedIntlProps>;
10+
SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "indexPatterns" | "filters" | "dataTestSubj" | "intl" | "refreshInterval" | "screenTitle" | "onRefresh" | "onRefreshChange" | "showQueryInput" | "showDatePicker" | "showAutoRefreshOnly" | "dateRangeFrom" | "dateRangeTo" | "isRefreshPaused" | "customSubmitButton" | "timeHistory" | "indicateNoData" | "onFiltersUpdated" | "trackUiMetric" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "showQueryBar" | "showFilterBar" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated">, "query" | "isLoading" | "indexPatterns" | "filters" | "dataTestSubj" | "refreshInterval" | "screenTitle" | "onRefresh" | "onRefreshChange" | "showQueryInput" | "showDatePicker" | "showAutoRefreshOnly" | "dateRangeFrom" | "dateRangeTo" | "isRefreshPaused" | "customSubmitButton" | "timeHistory" | "indicateNoData" | "onFiltersUpdated" | "trackUiMetric" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "showQueryBar" | "showFilterBar" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated">, any> & {
11+
WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "indexPatterns" | "filters" | "dataTestSubj" | "intl" | "refreshInterval" | "screenTitle" | "onRefresh" | "onRefreshChange" | "showQueryInput" | "showDatePicker" | "showAutoRefreshOnly" | "dateRangeFrom" | "dateRangeTo" | "isRefreshPaused" | "customSubmitButton" | "timeHistory" | "indicateNoData" | "onFiltersUpdated" | "trackUiMetric" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "showQueryBar" | "showFilterBar" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated"> & ReactIntl.InjectedIntlProps>;
1212
}
1313
```

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ start(core: CoreStart): {
1212
fieldFormatServiceFactory: (uiSettings: import("../../../core/server").IUiSettingsClient) => Promise<import("../common").FieldFormatsRegistry>;
1313
};
1414
indexPatterns: {
15-
indexPatternsServiceFactory: (savedObjectsClient: Pick<import("../../../core/server").SavedObjectsClient, "update" | "find" | "get" | "resolve" | "delete" | "errors" | "create" | "bulkCreate" | "checkConflicts" | "bulkGet" | "addToNamespaces" | "deleteFromNamespaces" | "bulkUpdate" | "removeReferencesTo">, elasticsearchClient: import("../../../core/server").ElasticsearchClient) => Promise<import("../public").IndexPatternsService>;
15+
indexPatternsServiceFactory: (savedObjectsClient: Pick<import("../../../core/server").SavedObjectsClient, "get" | "delete" | "create" | "update" | "bulkCreate" | "checkConflicts" | "find" | "bulkGet" | "resolve" | "addToNamespaces" | "deleteFromNamespaces" | "bulkUpdate" | "removeReferencesTo" | "errors">, elasticsearchClient: import("../../../core/server").ElasticsearchClient) => Promise<import("../public").IndexPatternsService>;
1616
};
1717
search: ISearchStart<import("./search").IEsSearchRequest, import("./search").IEsSearchResponse<any>>;
1818
};
@@ -31,7 +31,7 @@ start(core: CoreStart): {
3131
fieldFormatServiceFactory: (uiSettings: import("../../../core/server").IUiSettingsClient) => Promise<import("../common").FieldFormatsRegistry>;
3232
};
3333
indexPatterns: {
34-
indexPatternsServiceFactory: (savedObjectsClient: Pick<import("../../../core/server").SavedObjectsClient, "update" | "find" | "get" | "resolve" | "delete" | "errors" | "create" | "bulkCreate" | "checkConflicts" | "bulkGet" | "addToNamespaces" | "deleteFromNamespaces" | "bulkUpdate" | "removeReferencesTo">, elasticsearchClient: import("../../../core/server").ElasticsearchClient) => Promise<import("../public").IndexPatternsService>;
34+
indexPatternsServiceFactory: (savedObjectsClient: Pick<import("../../../core/server").SavedObjectsClient, "get" | "delete" | "create" | "update" | "bulkCreate" | "checkConflicts" | "find" | "bulkGet" | "resolve" | "addToNamespaces" | "deleteFromNamespaces" | "bulkUpdate" | "removeReferencesTo" | "errors">, elasticsearchClient: import("../../../core/server").ElasticsearchClient) => Promise<import("../public").IndexPatternsService>;
3535
};
3636
search: ISearchStart<import("./search").IEsSearchRequest, import("./search").IEsSearchResponse<any>>;
3737
}`

docs/maps/index.asciidoc

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,40 @@
99
[partintro]
1010
--
1111

12-
Maps enables you to parse through your geographical data at scale, with speed, and in real time. With features like multiple layers and indices in a map, plotting of raw documents, dynamic client-side styling, and global search across multiple layers, you can understand and monitor your data with ease.
12+
Create beautiful maps from your geographical data. With **Maps**, you can:
1313

14-
With Maps, you can:
15-
16-
* Create maps with multiple layers and indices.
17-
* Upload GeoJSON files into Elasticsearch.
14+
* Build maps with multiple layers and indices.
15+
* Upload GeoJSON.
1816
* Embed your map in dashboards.
1917
* Symbolize features using data values.
20-
* Focus in on just the data you want.
21-
22-
*Ready to get started?* Start your tour of Maps with the <<maps-getting-started, getting started tutorial>>.
18+
* Focus on only the data that’s important to you.
19+
20+
*Ready to get started?* Watch the https://videos.elastic.co/watch/BYzRDtH4u7RSD8wKhuEW1b[video], and then start your tour of **Maps** with the <<maps-getting-started, getting started tutorial>>.
21+
22+
++++
23+
<script type="text/javascript" async src="https://play.vidyard.com/embed/v4.js">
24+
</script>
25+
<img
26+
style="width: 100%; margin: auto; display: block;"
27+
class="vidyard-player-embed"
28+
src="https://play.vidyard.com/BYzRDtH4u7RSD8wKhuEW1b.jpg"
29+
data-uuid="BYzRDtH4u7RSD8wKhuEW1b"
30+
data-v="4"
31+
data-type="inline"
32+
/>
33+
</br>
34+
++++
2335

2436
[float]
25-
=== Create maps with multiple layers and indices
26-
You can use multiple layers and indices to show all your data in a single map. This enables your map to show how data sits relative to physical features like weather patterns, human-made features like international borders, and business-specific features like sales regions. You can plot individual documents or use aggregations to plot any data set, no matter how large.
37+
=== Build maps with multiple layers and indices
38+
Use multiple layers and indices to show all your data in a single map. Show how data sits relative to physical features like weather patterns, human-made features like international borders, and business-specific features like sales regions. Plot individual documents or use aggregations to plot any data set, no matter how large.
2739

2840
[role="screenshot"]
2941
image::maps/images/sample_data_ecommerce.png[]
3042

3143
[float]
32-
=== Upload GeoJSON files into Elasticsearch
33-
Maps makes it easy to import geospatial data into the Elastic Stack. Using the GeoJSON Upload feature, you can drag and drop your point and shape data files directly into Elasticsearch, and then use them as layers in the map.
44+
=== Upload GeoJSON
45+
Use **Maps** to drag and drop your GeoJSON points, lines, and polygons into Elasticsearch, and then use them as layers in your map.
3446

3547
[float]
3648
=== Embed your map in dashboards
@@ -43,11 +55,11 @@ image::maps/images/embed_in_dashboard.jpeg[]
4355

4456
[float]
4557
=== Symbolize features using data values
46-
You can customize each layer to highlight meaningful dimensions in your data. For example, you can use dark colors to symbolize areas with more web log traffic, and lighter colors to symbolize areas with less traffic.
58+
Customize each layer to highlight meaningful dimensions in your data. For example, use dark colors to symbolize areas with more web log traffic, and lighter colors to symbolize areas with less traffic.
4759

4860
[float]
49-
=== Focus in on just the data you want
50-
You can search across your Elasticsearch layers to focus in on just the data you want. Draw a polygon on the map or use the shape from features to create spatial filters to narrow search results to documents that either intersect with, are within, or do not intersect with the specified geometry. Filter individual layers to compares facets.
61+
=== Focus on only the data that’s important to you
62+
Search across your Elasticsearch layers to focus in on just the data you want. Combine free text search with field-based search using the <<kuery-query,{kib} Query Language>>. Set the time filter to restrict layers by time. Draw a polygon on the map or use the shape from features to create spatial filters. Filter individual layers to compares facets.
5163

5264

5365
--

docs/user/alerting/action-types/webhook.asciidoc

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,17 @@ Password:: An optional password. If set, HTTP basic authentication is used. Cur
7272

7373
Webhook actions have the following properties:
7474

75-
Body:: A json payload sent to the request URL.
75+
Body:: A JSON payload sent to the request URL. For example:
76+
+
77+
[source,text]
78+
--
79+
{
80+
"short_description": "{{context.rule.name}}",
81+
"description": "{{context.rule.description}}",
82+
...
83+
}
84+
--
85+
86+
Mustache template variables (the text enclosed in double braces, for example, `context.rule.name`) have
87+
their values escaped, so that the final JSON will be valid (escaping double quote characters).
88+
For more information on Mustache template variables, refer to <<defining-alerts-actions-details>>.

0 commit comments

Comments
 (0)