Skip to content

Commit ec9ecee

Browse files
YulNaumenkoYulNaumenko
committed
Merge remote-tracking branch upstream/master into alerting-health-banner-management-ui
2 parents 5814739 + 5cc945f commit ec9ecee

File tree

748 files changed

+48222
-31803
lines changed

Some content is hidden

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

748 files changed

+48222
-31803
lines changed

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/src/plugins/input_control_vis/ @elastic/kibana-app
1818
/src/plugins/management/ @elastic/kibana-app
1919
/src/plugins/kibana_legacy/ @elastic/kibana-app
20+
/src/plugins/timelion/ @elastic/kibana-app
2021
/src/plugins/vis_default_editor/ @elastic/kibana-app
2122
/src/plugins/vis_type_markdown/ @elastic/kibana-app
2223
/src/plugins/vis_type_metric/ @elastic/kibana-app
@@ -30,32 +31,23 @@
3031
/src/plugins/visualize/ @elastic/kibana-app
3132
/src/plugins/visualizations/ @elastic/kibana-app
3233
#CC# /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
33-
#CC# /src/plugins/vis_type @elastic/kibana-app
3434
#CC# /src/legacy/core_plugins/kibana/ @elastic/kibana-app
3535
#CC# /src/legacy/core_plugins/kibana/common/utils @elastic/kibana-app
3636
#CC# /src/legacy/core_plugins/kibana/migrations @elastic/kibana-app
3737
#CC# /src/legacy/core_plugins/kibana/public @elastic/kibana-app
3838
#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
39-
#CC# /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
4039
#CC# /src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
4140
#CC# /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
42-
#CC# /src/legacy/core_plugins/console_legacy @elastic/kibana-app
4341
#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-app
4442
#CC# /src/legacy/core_plugins/timelion @elastic/kibana-app
4543
#CC# /src/legacy/core_plugins/vis_type_tagcloud @elastic/kibana-app
4644
#CC# /src/legacy/core_plugins/vis_type_vega @elastic/kibana-app
4745
#CC# /src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
48-
#CC# /src/legacy/server/sample_data/ @elastic/kibana-app
4946
#CC# /src/legacy/server/url_shortening/ @elastic/kibana-app
5047
#CC# /src/legacy/ui/public/state_management @elastic/kibana-app
51-
#CC# /src/plugins/charts/public/static/color_maps @elastic/kibana-app
5248
#CC# /src/plugins/index_pattern_management/public @elastic/kibana-app
53-
#CC# /src/plugins/input_control_vis/ @elastic/kibana-app
54-
#CC# /src/plugins/kibana_legacy/ @elastic/kibana-app
55-
#CC# /src/plugins/timelion @elastic/kibana-app
5649
#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-app
5750
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-app
58-
#CC# /x-pack/plugins/lens/ @elastic/kibana-app
5951

6052
# App Architecture
6153
/examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -147,6 +139,7 @@
147139
/src/plugins/home/server/services/ @elastic/kibana-core-ui
148140
/x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
149141
#CC# /src/legacy/core_plugins/newsfeed @elastic/kibana-core-ui
142+
#CC# /src/legacy/server/sample_data/ @elastic/kibana-core-ui
150143
#CC# /src/plugins/newsfeed @elastic/kibana-core-ui
151144
#CC# /src/plugins/home/public @elastic/kibana-core-ui
152145
#CC# /src/plugins/home/server/services/ @elastic/kibana-core-ui
@@ -351,6 +344,8 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
351344
/x-pack/plugins/ingest_pipelines/ @elastic/es-ui
352345
/packages/kbn-ace/ @elastic/es-ui
353346
/packages/kbn-monaco/ @elastic/es-ui
347+
#CC# /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/es-ui
348+
#CC# /src/legacy/core_plugins/console_legacy @elastic/es-ui
354349
#CC# /x-pack/legacy/plugins/rollup/ @elastic/es-ui
355350
#CC# /x-pack/legacy/server/lib/create_router/ @elastic/es-ui
356351
#CC# /x-pack/legacy/server/lib/check_license/ @elastic/es-ui

‎NOTICE.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,30 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
208208
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
209209
SOFTWARE.
210210

211+
---
212+
MIT License
213+
214+
Copyright (c) 2014-present Sebastian McKenzie and other contributors
215+
216+
Permission is hereby granted, free of charge, to any person obtaining
217+
a copy of this software and associated documentation files (the
218+
"Software"), to deal in the Software without restriction, including
219+
without limitation the rights to use, copy, modify, merge, publish,
220+
distribute, sublicense, and/or sell copies of the Software, and to
221+
permit persons to whom the Software is furnished to do so, subject to
222+
the following conditions:
223+
224+
The above copyright notice and this permission notice shall be
225+
included in all copies or substantial portions of the Software.
226+
227+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
228+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
229+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
230+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
231+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
232+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
233+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
234+
211235
---
212236
This product bundles [email protected] which is available under a
213237
"MIT" license.

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ NOTE:
1616
[discrete]
1717
=== src/plugins
1818
19-
[%header,cols=2*]
19+
[%header,cols=2*]
2020
|===
2121
|Name
2222
|Description
@@ -168,7 +168,7 @@ It also provides a stateful version of it on the start contract.
168168
169169
170170
|{kib-repo}blob/{branch}/src/plugins/telemetry_management_section/README.md[telemetryManagementSection]
171-
|This plugin adds the Advanced Settings section for the Usage Data collection (aka Telemetry).
171+
|This plugin adds the Advanced Settings section for the Usage and Security Data collection (aka Telemetry).
172172
173173
174174
|{kib-repo}blob/{branch}/src/plugins/tile_map[tileMap]
@@ -259,7 +259,7 @@ which will load the visualization's editor.
259259
[discrete]
260260
=== x-pack/plugins
261261
262-
[%header,cols=2*]
262+
[%header,cols=2*]
263263
|===
264264
|Name
265265
|Description
@@ -515,6 +515,10 @@ As a developer you can reuse and extend built-in alerts and actions UI functiona
515515
in their infrastructure.
516516
517517
518+
|{kib-repo}blob/{branch}/x-pack/plugins/drilldowns/url_drilldown/README.md[urlDrilldown]
519+
|NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.
520+
521+
518522
|{kib-repo}blob/{branch}/x-pack/plugins/watcher/README.md[watcher]
519523
|This plugins adopts some conventions in addition to or in place of conventions in Kibana (at the time of the plugin's creation):
520524
@@ -523,10 +527,6 @@ in their infrastructure.
523527
|Contains HTTP endpoints and UiSettings that are slated for removal.
524528
525529
526-
|{kib-repo}blob/{branch}/x-pack/plugins/drilldowns/url_drilldown/README.md[urlDrilldown]
527-
|NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.
528-
529-
530530
|===
531531
532532
include::{kibana-root}/src/plugins/dashboard/README.asciidoc[leveloffset=+1]

‎docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ readonly links: {
9191
readonly gettingStarted: string;
9292
};
9393
readonly query: {
94+
readonly eql: string;
9495
readonly luceneQuerySyntax: string;
9596
readonly queryDsl: string;
9697
readonly kueryQuerySyntax: string;

‎docs/development/core/public/kibana-plugin-core-public.doclinksstart.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ export interface DocLinksStart
1717
| --- | --- | --- |
1818
| [DOC\_LINK\_VERSION](./kibana-plugin-core-public.doclinksstart.doc_link_version.md) | <code>string</code> | |
1919
| [ELASTIC\_WEBSITE\_URL](./kibana-plugin-core-public.doclinksstart.elastic_website_url.md) | <code>string</code> | |
20-
| [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code> readonly dashboard: {</code><br/><code> readonly drilldowns: string;</code><br/><code> readonly drilldownsTriggerPicker: string;</code><br/><code> readonly urlDrilldownTemplateSyntax: string;</code><br/><code> readonly urlDrilldownVariables: string;</code><br/><code> };</code><br/><code> readonly filebeat: {</code><br/><code> readonly base: string;</code><br/><code> readonly installation: string;</code><br/><code> readonly configuration: string;</code><br/><code> readonly elasticsearchOutput: string;</code><br/><code> readonly startup: string;</code><br/><code> readonly exportedFields: string;</code><br/><code> };</code><br/><code> readonly auditbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly metricbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly heartbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly logstash: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly functionbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly winlogbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly aggs: {</code><br/><code> readonly date_histogram: string;</code><br/><code> readonly date_range: string;</code><br/><code> readonly filter: string;</code><br/><code> readonly filters: string;</code><br/><code> readonly geohash_grid: string;</code><br/><code> readonly histogram: string;</code><br/><code> readonly ip_range: string;</code><br/><code> readonly range: string;</code><br/><code> readonly significant_terms: string;</code><br/><code> readonly terms: string;</code><br/><code> readonly avg: string;</code><br/><code> readonly avg_bucket: string;</code><br/><code> readonly max_bucket: string;</code><br/><code> readonly min_bucket: string;</code><br/><code> readonly sum_bucket: string;</code><br/><code> readonly cardinality: string;</code><br/><code> readonly count: string;</code><br/><code> readonly cumulative_sum: string;</code><br/><code> readonly derivative: string;</code><br/><code> readonly geo_bounds: string;</code><br/><code> readonly geo_centroid: string;</code><br/><code> readonly max: string;</code><br/><code> readonly median: string;</code><br/><code> readonly min: string;</code><br/><code> readonly moving_avg: string;</code><br/><code> readonly percentile_ranks: string;</code><br/><code> readonly serial_diff: string;</code><br/><code> readonly std_dev: string;</code><br/><code> readonly sum: string;</code><br/><code> readonly top_hits: string;</code><br/><code> };</code><br/><code> readonly scriptedFields: {</code><br/><code> readonly scriptFields: string;</code><br/><code> readonly scriptAggs: string;</code><br/><code> readonly painless: string;</code><br/><code> readonly painlessApi: string;</code><br/><code> readonly painlessSyntax: string;</code><br/><code> readonly luceneExpressions: string;</code><br/><code> };</code><br/><code> readonly indexPatterns: {</code><br/><code> readonly loadingData: string;</code><br/><code> readonly introduction: string;</code><br/><code> };</code><br/><code> readonly addData: string;</code><br/><code> readonly kibana: string;</code><br/><code> readonly siem: {</code><br/><code> readonly guide: string;</code><br/><code> readonly gettingStarted: string;</code><br/><code> };</code><br/><code> readonly query: {</code><br/><code> readonly luceneQuerySyntax: string;</code><br/><code> readonly queryDsl: string;</code><br/><code> readonly kueryQuerySyntax: string;</code><br/><code> };</code><br/><code> readonly date: {</code><br/><code> readonly dateMath: string;</code><br/><code> };</code><br/><code> readonly management: Record&lt;string, string&gt;;</code><br/><code> readonly visualize: Record&lt;string, string&gt;;</code><br/><code> }</code> | |
20+
| [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code> readonly dashboard: {</code><br/><code> readonly drilldowns: string;</code><br/><code> readonly drilldownsTriggerPicker: string;</code><br/><code> readonly urlDrilldownTemplateSyntax: string;</code><br/><code> readonly urlDrilldownVariables: string;</code><br/><code> };</code><br/><code> readonly filebeat: {</code><br/><code> readonly base: string;</code><br/><code> readonly installation: string;</code><br/><code> readonly configuration: string;</code><br/><code> readonly elasticsearchOutput: string;</code><br/><code> readonly startup: string;</code><br/><code> readonly exportedFields: string;</code><br/><code> };</code><br/><code> readonly auditbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly metricbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly heartbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly logstash: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly functionbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly winlogbeat: {</code><br/><code> readonly base: string;</code><br/><code> };</code><br/><code> readonly aggs: {</code><br/><code> readonly date_histogram: string;</code><br/><code> readonly date_range: string;</code><br/><code> readonly filter: string;</code><br/><code> readonly filters: string;</code><br/><code> readonly geohash_grid: string;</code><br/><code> readonly histogram: string;</code><br/><code> readonly ip_range: string;</code><br/><code> readonly range: string;</code><br/><code> readonly significant_terms: string;</code><br/><code> readonly terms: string;</code><br/><code> readonly avg: string;</code><br/><code> readonly avg_bucket: string;</code><br/><code> readonly max_bucket: string;</code><br/><code> readonly min_bucket: string;</code><br/><code> readonly sum_bucket: string;</code><br/><code> readonly cardinality: string;</code><br/><code> readonly count: string;</code><br/><code> readonly cumulative_sum: string;</code><br/><code> readonly derivative: string;</code><br/><code> readonly geo_bounds: string;</code><br/><code> readonly geo_centroid: string;</code><br/><code> readonly max: string;</code><br/><code> readonly median: string;</code><br/><code> readonly min: string;</code><br/><code> readonly moving_avg: string;</code><br/><code> readonly percentile_ranks: string;</code><br/><code> readonly serial_diff: string;</code><br/><code> readonly std_dev: string;</code><br/><code> readonly sum: string;</code><br/><code> readonly top_hits: string;</code><br/><code> };</code><br/><code> readonly scriptedFields: {</code><br/><code> readonly scriptFields: string;</code><br/><code> readonly scriptAggs: string;</code><br/><code> readonly painless: string;</code><br/><code> readonly painlessApi: string;</code><br/><code> readonly painlessSyntax: string;</code><br/><code> readonly luceneExpressions: string;</code><br/><code> };</code><br/><code> readonly indexPatterns: {</code><br/><code> readonly loadingData: string;</code><br/><code> readonly introduction: string;</code><br/><code> };</code><br/><code> readonly addData: string;</code><br/><code> readonly kibana: string;</code><br/><code> readonly siem: {</code><br/><code> readonly guide: string;</code><br/><code> readonly gettingStarted: string;</code><br/><code> };</code><br/><code> readonly query: {</code><br/><code> readonly eql: string;</code><br/><code> readonly luceneQuerySyntax: string;</code><br/><code> readonly queryDsl: string;</code><br/><code> readonly kueryQuerySyntax: string;</code><br/><code> };</code><br/><code> readonly date: {</code><br/><code> readonly dateMath: string;</code><br/><code> };</code><br/><code> readonly management: Record&lt;string, string&gt;;</code><br/><code> readonly visualize: Record&lt;string, string&gt;;</code><br/><code> }</code> | |
2121

‎docs/setup/production.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ Settings that must be the same:
135135
xpack.security.encryptionKey //decrypting session information
136136
xpack.reporting.encryptionKey //decrypting reports
137137
xpack.encryptedSavedObjects.encryptionKey // decrypting saved objects
138+
xpack.encryptedSavedObjects.keyRotation.decryptionOnlyKeys // saved objects encryption key rotation, if any
138139
--------
139140

140141
Separate configuration files can be used from the command line by using the `-c` flag:

0 commit comments

Comments
 (0)