Skip to content

Commit d29c77d

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into flash1293/formatted-date-range-filter
2 parents fb59377 + 65ab1dd commit d29c77d

947 files changed

Lines changed: 19868 additions & 14895 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.

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ bower_components
4040
/x-pack/legacy/plugins/infra/public/graphql/types.ts
4141
/x-pack/legacy/plugins/infra/server/graphql/types.ts
4242
/x-pack/legacy/plugins/apm/cypress/**/snapshots.js
43+
/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
4344
**/graphql/types.ts
4445
**/*.js.snap
4546
!/.eslintrc.js

‎.eslintrc.js‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
* Licensed to Elasticsearch B.V. under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch B.V. licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
120
const { readdirSync } = require('fs');
221
const { resolve } = require('path');
322

@@ -622,7 +641,6 @@ module.exports = {
622641
// will introduced after the other warns are fixed
623642
// 'react/sort-comp': 'error',
624643
'react/void-dom-elements-no-children': 'error',
625-
'react/jsx-boolean-value': ['error', 'warn'],
626644
// will introduced after the other warns are fixed
627645
// 'react/jsx-no-bind': 'error',
628646
'react/jsx-no-comment-textnodes': 'error',

‎.github/CODEOWNERS‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
/src/dev/ @elastic/kibana-operations
4444
/src/setup_node_env/ @elastic/kibana-operations
4545
/src/optimize/ @elastic/kibana-operations
46+
/packages/*eslint*/ @elastic/kibana-operations
47+
/packages/*babel*/ @elastic/kibana-operations
48+
/packages/kbn-dev-utils*/ @elastic/kibana-operations
49+
/packages/kbn-es/ @elastic/kibana-operations
50+
/packages/kbn-pm/ @elastic/kibana-operations
51+
/packages/kbn-test/ @elastic/kibana-operations
4652

4753
# Platform
4854
/src/core/ @elastic/kibana-platform
@@ -81,6 +87,9 @@
8187
/x-pack/legacy/plugins/rollup/ @elastic/es-ui
8288
/x-pack/legacy/plugins/searchprofiler/ @elastic/es-ui
8389
/x-pack/legacy/plugins/snapshot_restore/ @elastic/es-ui
90+
# ML team owns the transform plugin, ES team added here for visibility
91+
# because the plugin lives in Kibana's Elasticsearch management section.
92+
/x-pack/legacy/plugins/transform/ @elastic/es-ui
8493
/x-pack/legacy/plugins/watcher/ @elastic/es-ui
8594

8695
# Kibana TSVB external contractors

‎.i18nrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"paths": {
33
"common.ui": "src/legacy/ui",
4-
"data": "src/legacy/core_plugins/data",
4+
"data": ["src/legacy/core_plugins/data", "src/plugins/data"],
55
"expressions": "src/legacy/core_plugins/expressions",
66
"kibana_react": "src/legacy/core_plugins/kibana_react",
77
"server": "src/legacy/server",

‎Jenkinsfile‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
1717
'oss-ciGroup4': getOssCiGroupWorker(4),
1818
'oss-ciGroup5': getOssCiGroupWorker(5),
1919
'oss-ciGroup6': getOssCiGroupWorker(6),
20-
]),
21-
'kibana-oss-agent2': withWorkers('kibana-oss-tests2', { buildOss() }, [
2220
'oss-ciGroup7': getOssCiGroupWorker(7),
2321
'oss-ciGroup8': getOssCiGroupWorker(8),
2422
'oss-ciGroup9': getOssCiGroupWorker(9),
@@ -34,8 +32,6 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
3432
'xpack-ciGroup3': getXpackCiGroupWorker(3),
3533
'xpack-ciGroup4': getXpackCiGroupWorker(4),
3634
'xpack-ciGroup5': getXpackCiGroupWorker(5),
37-
]),
38-
'kibana-xpack-agent2': withWorkers('kibana-xpack-tests2', { buildXpack() }, [
3935
'xpack-ciGroup6': getXpackCiGroupWorker(6),
4036
'xpack-ciGroup7': getXpackCiGroupWorker(7),
4137
'xpack-ciGroup8': getXpackCiGroupWorker(8),
@@ -60,7 +56,7 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
6056

6157
def withWorkers(name, preWorkerClosure = {}, workerClosures = [:]) {
6258
return {
63-
jobRunner('tests-xl') {
59+
jobRunner('tests-xl', true) {
6460
try {
6561
doSetup()
6662
preWorkerClosure()
@@ -151,7 +147,7 @@ def legacyJobRunner(name) {
151147
withEnv([
152148
"JOB=${name}",
153149
]) {
154-
jobRunner('linux && immutable') {
150+
jobRunner('linux && immutable', false) {
155151
try {
156152
runbld('.ci/run.sh', true)
157153
} finally {
@@ -172,8 +168,21 @@ def legacyJobRunner(name) {
172168
}
173169
}
174170

175-
def jobRunner(label, closure) {
171+
def jobRunner(label, useRamDisk, closure) {
176172
node(label) {
173+
if (useRamDisk) {
174+
// Move to a temporary workspace, so that we can symlink the real workspace into /dev/shm
175+
def originalWorkspace = env.WORKSPACE
176+
ws('/tmp/workspace') {
177+
sh """
178+
mkdir -p /dev/shm/workspace
179+
mkdir -p '${originalWorkspace}' # create all of the directories leading up to the workspace, if they don't exist
180+
rm --preserve-root -rf '${originalWorkspace}' # then remove just the workspace, just in case there's stuff in it
181+
ln -s /dev/shm/workspace '${originalWorkspace}'
182+
"""
183+
}
184+
}
185+
177186
def scmVars = checkout scm
178187

179188
withEnv([

‎NOTICE.txt‎

Lines changed: 66 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,55 @@
11
Kibana source code with Kibana X-Pack source code
22
Copyright 2012-2019 Elasticsearch B.V.
33

4+
---
5+
Pretty handling of logarithmic axes.
6+
Copyright (c) 2007-2014 IOLA and Ole Laursen.
7+
Licensed under the MIT license.
8+
Created by Arne de Laat
9+
Set axis.mode to "log" and make the axis logarithmic using transform:
10+
axis: {
11+
mode: 'log',
12+
transform: function(v) {v <= 0 ? Math.log(v) / Math.LN10 : null},
13+
inverseTransform: function(v) {Math.pow(10, v)}
14+
}
15+
The transform filters negative and zero values, because those are
16+
invalid on logarithmic scales.
17+
This plugin tries to create good looking logarithmic ticks, using
18+
unicode superscript characters. If all data to be plotted is between two
19+
powers of ten then the default flot tick generator and renderer are
20+
used. Logarithmic ticks are places at powers of ten and at half those
21+
values if there are not to many ticks already (e.g. [1, 5, 10, 50, 100]).
22+
For details, see https://github.com/flot/flot/pull/1328
23+
424
---
525
This product has relied on ASTExplorer that is licensed under MIT.
626

27+
---
28+
This product includes code that is based on flot-charts, which was available
29+
under a "MIT" license.
30+
31+
The MIT License (MIT)
32+
33+
Copyright (c) 2007-2014 IOLA and Ole Laursen
34+
35+
Permission is hereby granted, free of charge, to any person obtaining a copy
36+
of this software and associated documentation files (the "Software"), to deal
37+
in the Software without restriction, including without limitation the rights
38+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
39+
copies of the Software, and to permit persons to whom the Software is
40+
furnished to do so, subject to the following conditions:
41+
42+
The above copyright notice and this permission notice shall be included in
43+
all copies or substantial portions of the Software.
44+
45+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
46+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
47+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
48+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
49+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
50+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
51+
THE SOFTWARE.
52+
753
---
854
This product uses Noto fonts that are licensed under the SIL Open
955
Font License, Version 1.1.
@@ -34,26 +80,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
3480
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3581
SOFTWARE.
3682

37-
---
38-
Pretty handling of logarithmic axes.
39-
Copyright (c) 2007-2014 IOLA and Ole Laursen.
40-
Licensed under the MIT license.
41-
Created by Arne de Laat
42-
Set axis.mode to "log" and make the axis logarithmic using transform:
43-
axis: {
44-
mode: 'log',
45-
transform: function(v) {v <= 0 ? Math.log(v) / Math.LN10 : null},
46-
inverseTransform: function(v) {Math.pow(10, v)}
47-
}
48-
The transform filters negative and zero values, because those are
49-
invalid on logarithmic scales.
50-
This plugin tries to create good looking logarithmic ticks, using
51-
unicode superscript characters. If all data to be plotted is between two
52-
powers of ten then the default flot tick generator and renderer are
53-
used. Logarithmic ticks are places at powers of ten and at half those
54-
values if there are not to many ticks already (e.g. [1, 5, 10, 50, 100]).
55-
For details, see https://github.com/flot/flot/pull/1328
56-
5783
---
5884
This product bundles bootstrap@3.3.6 which is available under a
5985
"MIT" license.
@@ -107,6 +133,26 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
107133
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
108134
THE SOFTWARE.
109135

136+
---
137+
This product bundles code based on probot-metadata@1.0.0 which is
138+
available under a "MIT" license.
139+
140+
ISC License
141+
142+
Copyright (c) 2017 Brandon Keepers
143+
144+
Permission to use, copy, modify, and/or distribute this software for any
145+
purpose with or without fee is hereby granted, provided that the above
146+
copyright notice and this permission notice appear in all copies.
147+
148+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
149+
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
150+
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
151+
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
152+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
153+
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
154+
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
155+
110156
---
111157
This product includes code that is adapted from mapbox-gl-js, which is
112158
available under a "BSD-3-Clause" license.
@@ -166,32 +212,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
166212
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
167213
SOFTWARE.
168214

169-
---
170-
This product includes code that is based on flot-charts, which was available
171-
under a "MIT" license.
172-
173-
The MIT License (MIT)
174-
175-
Copyright (c) 2007-2014 IOLA and Ole Laursen
176-
177-
Permission is hereby granted, free of charge, to any person obtaining a copy
178-
of this software and associated documentation files (the "Software"), to deal
179-
in the Software without restriction, including without limitation the rights
180-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
181-
copies of the Software, and to permit persons to whom the Software is
182-
furnished to do so, subject to the following conditions:
183-
184-
The above copyright notice and this permission notice shall be included in
185-
all copies or substantial portions of the Software.
186-
187-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
188-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
189-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
190-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
191-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
192-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
193-
THE SOFTWARE.
194-
195215
---
196216
This product includes code that was extracted from angular@1.3.
197217
Original license:

‎docs/api/saved-objects/bulk_create.asciidoc‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ experimental[] Create multiple {kib} saved objects.
1111

1212
`POST /api/saved_objects/_bulk_create`
1313

14+
`POST /s/<space_id>/api/saved_objects/_bulk_create`
15+
16+
17+
[[saved-objects-api-bulk-create-path-params]]
18+
==== Path parameters
19+
20+
`space_id`::
21+
(Optional, string) An identifier for the space. If `space_id` is not provided in the URL the default space is used.
22+
1423
[[saved-objects-api-bulk-create-query-params]]
1524
==== Query parameters
1625

@@ -38,21 +47,21 @@ experimental[] Create multiple {kib} saved objects.
3847
[[saved-objects-api-bulk-create-response-body]]
3948
==== Response body
4049

41-
`saved_objects`::
50+
`saved_objects`::
4251
(array) Top-level property the contains objects that represent the response for each of the requested objects. The order of the objects in the response is identical to the order of the objects in the request.
4352

4453
Saved objects that are unable to persist are replaced with an error object.
4554

4655
[[saved-objects-api-bulk-create-codes]]
4756
==== Response code
4857

49-
`200`::
58+
`200`::
5059
Indicates a successful call.
5160

5261
[[saved-objects-api-bulk-create-example]]
5362
==== Example
5463

55-
Create an index pattern with the `my-pattern` ID, and a dashboard with the `my-dashboard` ID:
64+
Create an index pattern with the `my-pattern` ID, and a dashboard with the `my-dashboard` ID:
5665

5766
[source,js]
5867
--------------------------------------------------
@@ -67,7 +76,7 @@ POST api/saved_objects/_bulk_create
6776
},
6877
{
6978
"type": "dashboard",
70-
"id": "my-dashboard",
79+
"id": "be3733a0-9efe-11e7-acb3-3dab96693fab",
7180
"attributes": {
7281
"title": "Look at my dashboard"
7382
}
@@ -91,7 +100,7 @@ The API returns the following:
91100
}
92101
},
93102
{
94-
"id": "my-dashboard",
103+
"id": "be3733a0-9efe-11e7-acb3-3dab96693fab",
95104
"type": "dashboard",
96105
"error": {
97106
"statusCode": 409,

‎docs/api/saved-objects/bulk_get.asciidoc‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,44 @@ experimental[] Retrieve multiple {kib} saved objects by ID.
1111

1212
`POST /api/saved_objects/_bulk_get`
1313

14+
`POST /s/<space_id>/api/saved_objects/_bulk_get`
15+
16+
[[saved-objects-api-bulk-get-path-params]]
17+
==== Path parameters
18+
19+
`space_id`::
20+
(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.
21+
1422
[[saved-objects-api-bulk-get-request-body]]
1523
==== Request Body
1624

1725
`type`::
1826
(Required, string) Valid options include `visualization`, `dashboard`, `search`, `index-pattern`, `config`, and `timelion-sheet`.
1927

2028
`id`::
21-
(Required, string) ID of the retrieved object.
29+
(Required, string) ID of the retrieved object. The ID includes the {kib} unique identifier or a custom identifier.
2230

2331
`fields`::
2432
(Optional, array) The fields returned in the object response.
25-
33+
2634
[[saved-objects-api-bulk-get-response-body]]
2735
==== Response body
2836

29-
`saved_objects`::
37+
`saved_objects`::
3038
(array) Top-level property the contains objects that represent the response for each of the requested objects. The order of the objects in the response is identical to the order of the objects in the request.
3139

3240
Saved objects that are unable to persist are replaced with an error object.
3341

3442
[[saved-objects-api-bulk-get-body-codes]]
3543
==== Response code
3644

37-
`200`::
38-
Indicates a successfully call.
45+
`200`::
46+
Indicates a successful call.
3947

4048
[[saved-objects-api-bulk-get-body-example]]
4149
==== Example
4250

43-
Retrieve an index pattern with the `my-pattern` ID, and a dashboard with the `my-dashboard` ID:
51+
Retrieve an index pattern with the `my-pattern` ID, and a dashboard with the `my-dashboard` ID:
4452

4553
[source,js]
4654
--------------------------------------------------
@@ -52,7 +60,7 @@ POST api/saved_objects/_bulk_get
5260
},
5361
{
5462
"type": "dashboard",
55-
"id": "my-dashboard"
63+
"id": "be3733a0-9efe-11e7-acb3-3dab96693fab"
5664
}
5765
]
5866
--------------------------------------------------

0 commit comments

Comments
 (0)