Skip to content

Commit 3c51c3a

Browse files
Merge branch 'master' into dev/remove-panels-from-url
2 parents 55603db + 055d1fb commit 3c51c3a

File tree

2,220 files changed

+25451
-55367
lines changed

Some content is hidden

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

2,220 files changed

+25451
-55367
lines changed

.eslintignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ bower_components
99
/built_assets
1010
/html_docs
1111
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
12-
/src/legacy/core_plugins/vis_type_timelion/public/_generated_/**
12+
/src/plugins/vis_type_timelion/public/_generated_/**
1313
src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
1414
/src/legacy/ui/public/flot-charts
1515
/test/fixtures/scenarios
1616
/src/legacy/core_plugins/console/public/webpackShims
1717
/src/legacy/core_plugins/console/public/tests/webpackShims
1818
/src/legacy/ui/public/utils/decode_geo_hash.js
19-
/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
19+
/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
2020
/src/core/lib/kbn_internal_native_observable
2121
/packages/*/target
2222
/packages/eslint-config-kibana

.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ module.exports = {
567567
},
568568
{
569569
// typescript only for front and back end
570-
files: ['x-pack/legacy/plugins/siem/**/*.{ts,tsx}'],
570+
files: ['x-pack/{,legacy/}plugins/siem/**/*.{ts,tsx}'],
571571
rules: {
572572
// This will be turned on after bug fixes are complete
573573
// '@typescript-eslint/explicit-member-accessibility': 'warn',
@@ -613,7 +613,7 @@ module.exports = {
613613
// },
614614
{
615615
// typescript and javascript for front and back end
616-
files: ['x-pack/legacy/plugins/siem/**/*.{js,ts,tsx}'],
616+
files: ['x-pack/{,legacy/}plugins/siem/**/*.{js,ts,tsx}'],
617617
plugins: ['eslint-plugin-node', 'react'],
618618
env: {
619619
mocha: true,

.github/CODEOWNERS

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@
99
/src/legacy/server/sample_data/ @elastic/kibana-app
1010
/src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
1111
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
12-
/src/legacy/core_plugins/kibana/public/visualize/ @elastic/kibana-app
1312
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
1413
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
1514
/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
1615
/src/plugins/vis_type_xy/ @elastic/kibana-app
1716
/src/plugins/kibana_legacy/ @elastic/kibana-app
18-
/src/plugins/timelion/ @elastic/kibana-app
17+
/src/plugins/vis_type_timelion/ @elastic/kibana-app
1918
/src/plugins/dashboard/ @elastic/kibana-app
2019
/src/plugins/discover/ @elastic/kibana-app
20+
/src/plugins/visualize/ @elastic/kibana-app
2121
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
22+
/src/plugins/vis_type_metric/ @elastic/kibana-app
23+
/src/plugins/vis_type_markdown/ @elastic/kibana-app
2224

2325
# Core UI
2426
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
@@ -130,7 +132,6 @@
130132
/packages/kbn-config-schema/ @elastic/kibana-platform
131133
/src/legacy/server/config/ @elastic/kibana-platform
132134
/src/legacy/server/http/ @elastic/kibana-platform
133-
/src/legacy/server/i18n/ @elastic/kibana-platform
134135
/src/legacy/server/logging/ @elastic/kibana-platform
135136
/src/legacy/server/saved_objects/ @elastic/kibana-platform
136137
/src/legacy/server/status/ @elastic/kibana-platform
@@ -149,7 +150,10 @@
149150
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
150151

151152
# Kibana Localization
152-
/src/dev/i18n/ @elastic/kibana-localization
153+
/src/dev/i18n/ @elastic/kibana-localization
154+
/src/legacy/server/i18n/ @elastic/kibana-localization
155+
/src/core/public/i18n/ @elastic/kibana-localization
156+
/packages/kbn-i18n/ @elastic/kibana-localization
153157

154158
# Pulse
155159
/packages/kbn-analytics/ @elastic/pulse
@@ -205,9 +209,12 @@
205209
# Endpoint
206210
/x-pack/plugins/endpoint/ @elastic/endpoint-app-team
207211
/x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team
212+
/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team
208213
/x-pack/test/functional_endpoint/ @elastic/endpoint-app-team
209214
/x-pack/test/functional_endpoint_ingest_failure/ @elastic/endpoint-app-team
210215
/x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team
216+
/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team
217+
/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team
211218

212219
# SIEM
213220
/x-pack/legacy/plugins/siem/ @elastic/siem

.github/paths-labeller.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@
88
- "Feature:ExpressionLanguage":
99
- "src/plugins/expressions/**/*.*"
1010
- "src/plugins/bfetch/**/*.*"
11+
- "Team:uptime":
12+
- "x-pack/plugins/uptime/**/*.*"
13+
- "x-pack/legacy/plugins/uptime/**/*.*"

.i18nrc.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,19 @@
4343
"src/plugins/telemetry_management_section"
4444
],
4545
"tileMap": "src/legacy/core_plugins/tile_map",
46-
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
46+
"timelion": ["src/legacy/core_plugins/timelion", "src/plugins/vis_type_timelion"],
4747
"uiActions": "src/plugins/ui_actions",
4848
"visDefaultEditor": "src/plugins/vis_default_editor",
49-
"visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
50-
"visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
49+
"visTypeMarkdown": "src/plugins/vis_type_markdown",
50+
"visTypeMetric": "src/plugins/vis_type_metric",
5151
"visTypeTable": "src/legacy/core_plugins/vis_type_table",
5252
"visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
5353
"visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
5454
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
5555
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
5656
"visTypeXy": "src/legacy/core_plugins/vis_type_xy",
57-
"visualizations": "src/plugins/visualizations"
57+
"visualizations": "src/plugins/visualizations",
58+
"visualize": "src/plugins/visualize"
5859
},
5960
"exclude": [
6061
"src/legacy/ui/ui_render/ui_render_mixin.js"

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
4141
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4242
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
4343
'xpack-siemCypress': { processNumber ->
44-
whenChanged(['x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
44+
whenChanged(['x-pack/plugins/siem/', 'x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
4545
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
4646
}
4747
},

docs/api/saved-objects/create.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ any data that you send to the API is properly formed.
5757

5858
[source,sh]
5959
--------------------------------------------------
60-
$ curl -X POST "localhost:5601/api/saved_objects/index-pattern/my-pattern"
60+
$ curl -X POST "localhost:5601/api/saved_objects/index-pattern/my-pattern" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
6161
{
6262
"attributes": {
6363
"title": "my-pattern-*"
6464
}
65-
}
65+
}'
6666
--------------------------------------------------
6767
// KIBANA
6868

docs/api/saved-objects/export.asciidoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,46 +68,46 @@ Export all index pattern saved objects:
6868

6969
[source,sh]
7070
--------------------------------------------------
71-
$ curl -X POST "localhost:5601/api/saved_objects/_export"
71+
$ curl -X POST "localhost:5601/api/saved_objects/_export" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
7272
{
7373
"type": "index-pattern"
74-
}
74+
}'
7575
--------------------------------------------------
7676
// KIBANA
7777

7878
Export all index pattern saved objects and exclude the export summary from the stream:
7979

8080
[source,sh]
8181
--------------------------------------------------
82-
$ curl -X POST "localhost:5601/api/saved_objects/_export"
82+
$ curl -X POST "localhost:5601/api/saved_objects/_export" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
8383
{
8484
"type": "index-pattern",
8585
"excludeExportDetails": true
86-
}
86+
}'
8787
--------------------------------------------------
8888
// KIBANA
8989

9090
Export a specific saved object:
9191

9292
[source,sh]
9393
--------------------------------------------------
94-
$ curl -X POST "localhost:5601/api/saved_objects/_export"
94+
$ curl -X POST "localhost:5601/api/saved_objects/_export" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
9595
{
9696
"objects": [
9797
{
9898
"type": "dashboard",
9999
"id": "be3733a0-9efe-11e7-acb3-3dab96693fab"
100100
}
101101
]
102-
}
102+
}'
103103
--------------------------------------------------
104104
// KIBANA
105105

106106
Export a specific saved object and it's related objects :
107107

108108
[source,sh]
109109
--------------------------------------------------
110-
$ curl -X POST "localhost:5601/api/saved_objects/_export"
110+
$ curl -X POST "localhost:5601/api/saved_objects/_export" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
111111
{
112112
"objects": [
113113
{
@@ -116,6 +116,6 @@ $ curl -X POST "localhost:5601/api/saved_objects/_export"
116116
}
117117
],
118118
"includeReferencesDeep": true
119-
}
119+
}'
120120
--------------------------------------------------
121121
// KIBANA

docs/development/core/server/kibana-plugin-core-server.coresetup.http.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@
99
<b>Signature:</b>
1010

1111
```typescript
12-
http: HttpServiceSetup;
12+
http: HttpServiceSetup & {
13+
resources: HttpResources;
14+
};
1315
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
2020
| [context](./kibana-plugin-core-server.coresetup.context.md) | <code>ContextSetup</code> | [ContextSetup](./kibana-plugin-core-server.contextsetup.md) |
2121
| [elasticsearch](./kibana-plugin-core-server.coresetup.elasticsearch.md) | <code>ElasticsearchServiceSetup</code> | [ElasticsearchServiceSetup](./kibana-plugin-core-server.elasticsearchservicesetup.md) |
2222
| [getStartServices](./kibana-plugin-core-server.coresetup.getstartservices.md) | <code>StartServicesAccessor&lt;TPluginsStart, TStart&gt;</code> | [StartServicesAccessor](./kibana-plugin-core-server.startservicesaccessor.md) |
23-
| [http](./kibana-plugin-core-server.coresetup.http.md) | <code>HttpServiceSetup</code> | [HttpServiceSetup](./kibana-plugin-core-server.httpservicesetup.md) |
23+
| [http](./kibana-plugin-core-server.coresetup.http.md) | <code>HttpServiceSetup &amp; {</code><br/><code> resources: HttpResources;</code><br/><code> }</code> | [HttpServiceSetup](./kibana-plugin-core-server.httpservicesetup.md) |
2424
| [metrics](./kibana-plugin-core-server.coresetup.metrics.md) | <code>MetricsServiceSetup</code> | [MetricsServiceSetup](./kibana-plugin-core-server.metricsservicesetup.md) |
2525
| [savedObjects](./kibana-plugin-core-server.coresetup.savedobjects.md) | <code>SavedObjectsServiceSetup</code> | [SavedObjectsServiceSetup](./kibana-plugin-core-server.savedobjectsservicesetup.md) |
2626
| [status](./kibana-plugin-core-server.coresetup.status.md) | <code>StatusServiceSetup</code> | [StatusServiceSetup](./kibana-plugin-core-server.statusservicesetup.md) |

0 commit comments

Comments
 (0)