Skip to content

Commit ea26d3d

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into EMT-65_naming_changes_are_restructuring
2 parents 1128056 + 88ba41f commit ea26d3d

1,257 files changed

Lines changed: 15500 additions & 9990 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.

‎.eslintrc.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,8 @@ module.exports = {
262262
'src/core/server/**/*',
263263
'(src|x-pack)/plugins/*/server/**/*',
264264
'examples/**/server/**/*',
265+
// TODO: Remove the 'joi' eslint rule once IE11 support is dropped
266+
'joi',
265267
],
266268
errorMessage:
267269
'Server modules cannot be imported into client modules or shared modules.',

‎.github/CODEOWNERS‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
1717
/src/legacy/core_plugins/metrics/ @elastic/kibana-app
1818
/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
19-
/src/plugins/home/ @elastic/kibana-app
19+
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
20+
/src/plugins/home/public @elastic/kibana-app
21+
/src/plugins/home/server/*.ts @elastic/kibana-app
22+
/src/plugins/home/server/services/ @elastic/kibana-app
2023
/src/plugins/kibana_legacy/ @elastic/kibana-app
2124
/src/plugins/timelion/ @elastic/kibana-app
2225
/src/plugins/dev_tools/ @elastic/kibana-app
@@ -45,8 +48,11 @@
4548

4649
# APM
4750
/x-pack/legacy/plugins/apm/ @elastic/apm-ui
51+
/x-pack/plugins/apm/ @elastic/apm-ui
4852
/x-pack/test/functional/apps/apm/ @elastic/apm-ui
4953
/src/legacy/core_plugins/apm_oss/ @elastic/apm-ui
54+
/src/plugins/apm_oss/ @elastic/apm-ui
55+
/src/apm.js @watson
5056

5157
# Beats
5258
/x-pack/legacy/plugins/beats_management/ @elastic/beats
@@ -153,4 +159,4 @@
153159
/x-pack/legacy/plugins/rollup/ @elastic/es-ui
154160
/x-pack/plugins/searchprofiler/ @elastic/es-ui
155161
/x-pack/legacy/plugins/snapshot_restore/ @elastic/es-ui
156-
/x-pack/legacy/plugins/watcher/ @elastic/es-ui
162+
/x-pack/plugins/watcher/ @elastic/es-ui

‎.i18nrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"statusPage": "src/legacy/core_plugins/status_page",
3333
"telemetry": "src/legacy/core_plugins/telemetry",
3434
"tileMap": "src/legacy/core_plugins/tile_map",
35-
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion"],
35+
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
3636
"uiActions": "src/plugins/ui_actions",
3737
"visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
3838
"visTypeMetric": "src/legacy/core_plugins/vis_type_metric",

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ The `config/kibana.yml` file stores user configuration directives. Since this fi
338338

339339
#### Setting Up SSL
340340

341-
Kibana includes a self-signed certificate that can be used for development purposes: `yarn start --ssl`.
341+
Kibana includes self-signed certificates that can be used for development purposes in the browser and for communicating with Elasticsearch: `yarn start --ssl` & `yarn es snapshot --ssl`.
342342

343343
### Linting
344344

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,6 @@ readonly links: {
9191
readonly date: {
9292
readonly dateMath: string;
9393
};
94+
readonly management: Record<string, string>;
9495
};
9596
```

‎docs/development/core/public/kibana-plugin-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-public.doclinksstart.doc_link_version.md) | <code>string</code> | |
1919
| [ELASTIC\_WEBSITE\_URL](./kibana-plugin-public.doclinksstart.elastic_website_url.md) | <code>string</code> | |
20-
| [links](./kibana-plugin-public.doclinksstart.links.md) | <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 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> }</code> | |
20+
| [links](./kibana-plugin-public.doclinksstart.links.md) | <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 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> }</code> | |
2121

‎docs/development/core/public/kibana-plugin-public.httperrorrequest.error.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎docs/development/core/public/kibana-plugin-public.httperrorrequest.request.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎docs/development/core/public/kibana-plugin-public.httperrorresponse.error.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)