Skip to content

Commit

Permalink
Merge branch '7.x' into backport/7.x/pr-60795
Browse files Browse the repository at this point in the history
  • Loading branch information
@elasticmachine
elasticmachine authored Mar 24, 2020
2 parents b76dc4e + 8d39068 commit e0aff7a
Show file tree
Hide file tree
Showing 1,423 changed files with 67,286 additions and 19,577 deletions.
6 changes: 0 additions & 6 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@ module.exports = {
'jsx-a11y/no-onchange': 'off',
},
},
{
files: ['src/legacy/core_plugins/data/**/*.{js,ts,tsx}'],
rules: {
'react-hooks/exhaustive-deps': 'off',
},
},
{
files: ['src/legacy/core_plugins/expressions/**/*.{js,ts,tsx}'],
rules: {
Expand Down
10 changes: 4 additions & 6 deletions .i18nrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
"common.ui": "src/legacy/ui",
"console": "src/plugins/console",
"core": "src/core",
"discover": "src/plugins/discover",
"dashboard": "src/plugins/dashboard",
"data": [
"src/legacy/core_plugins/data",
"src/plugins/data"
],
"data": "src/plugins/data",
"embeddableApi": "src/plugins/embeddable",
"embeddableExamples": "examples/embeddable_examples",
"share": "src/plugins/share",
Expand Down Expand Up @@ -38,8 +36,8 @@
"server": "src/legacy/server",
"statusPage": "src/legacy/core_plugins/status_page",
"telemetry": [
"src/legacy/core_plugins/telemetry",
"src/plugins/telemetry"
"src/plugins/telemetry",
"src/plugins/telemetry_management_section"
],
"tileMap": "src/legacy/core_plugins/tile_map",
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
Expand Down
7 changes: 6 additions & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
'xpack-siemCypress': kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh'),
'xpack-siemCypress': { processNumber ->
whenChanged(['x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
}
},

// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
]),
])
Expand Down
19 changes: 14 additions & 5 deletions docs/api/saved-objects/bulk_create.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ experimental[] Create multiple {kib} saved objects.

`POST /api/saved_objects/_bulk_create`

`POST /s/<space_id>/api/saved_objects/_bulk_create`


[[saved-objects-api-bulk-create-path-params]]
==== Path parameters

`space_id`::
(Optional, string) An identifier for the space. If `space_id` is not provided in the URL the default space is used.

[[saved-objects-api-bulk-create-query-params]]
==== Query parameters

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

`saved_objects`::
`saved_objects`::
(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.

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

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

`200`::
`200`::
Indicates a successful call.

[[saved-objects-api-bulk-create-example]]
==== Example

Create an index pattern with the `my-pattern` ID, and a dashboard with the `my-dashboard` ID:
Create an index pattern with the `my-pattern` ID, and a dashboard with the `my-dashboard` ID:

[source,js]
--------------------------------------------------
Expand All @@ -67,7 +76,7 @@ POST api/saved_objects/_bulk_create
},
{
"type": "dashboard",
"id": "my-dashboard",
"id": "be3733a0-9efe-11e7-acb3-3dab96693fab",
"attributes": {
"title": "Look at my dashboard"
}
Expand All @@ -91,7 +100,7 @@ The API returns the following:
}
},
{
"id": "my-dashboard",
"id": "be3733a0-9efe-11e7-acb3-3dab96693fab",
"type": "dashboard",
"error": {
"statusCode": 409,
Expand Down
22 changes: 15 additions & 7 deletions docs/api/saved-objects/bulk_get.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,44 @@ experimental[] Retrieve multiple {kib} saved objects by ID.

`POST /api/saved_objects/_bulk_get`

`POST /s/<space_id>/api/saved_objects/_bulk_get`

[[saved-objects-api-bulk-get-path-params]]
==== Path parameters

`space_id`::
(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.

[[saved-objects-api-bulk-get-request-body]]
==== Request Body

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

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

`fields`::
(Optional, array) The fields returned in the object response.

[[saved-objects-api-bulk-get-response-body]]
==== Response body

`saved_objects`::
`saved_objects`::
(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.

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

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

`200`::
Indicates a successfully call.
`200`::
Indicates a successful call.

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

Retrieve an index pattern with the `my-pattern` ID, and a dashboard with the `my-dashboard` ID:
Retrieve an index pattern with the `my-pattern` ID, and a dashboard with the `my-dashboard` ID:

[source,js]
--------------------------------------------------
Expand All @@ -52,7 +60,7 @@ POST api/saved_objects/_bulk_get
},
{
"type": "dashboard",
"id": "my-dashboard"
"id": "be3733a0-9efe-11e7-acb3-3dab96693fab"
}
]
--------------------------------------------------
Expand Down
9 changes: 7 additions & 2 deletions docs/api/saved-objects/create.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,14 @@ experimental[] Create {kib} saved objects.

`POST /api/saved_objects/<type>/<id>`

`POST /s/<space_id>/saved_objects/<type>`

[[saved-objects-api-create-path-params]]
==== Path parameters

`space_id`::
(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.

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

Expand Down Expand Up @@ -44,9 +49,9 @@ any data that you send to the API is properly formed.
[[saved-objects-api-create-request-codes]]
==== Response code

`200`::
`200`::
Indicates a successful call.

[[saved-objects-api-create-example]]
==== Example

Expand Down
7 changes: 6 additions & 1 deletion docs/api/saved-objects/delete.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,14 @@ WARNING: Once you delete a saved object, _it cannot be recovered_.

`DELETE /api/saved_objects/<type>/<id>`

`DELETE /s/<space_id>/api/saved_objects/<type>/<id>`

[[saved-objects-api-delete-path-params]]
==== Path parameters

`space_id`::
(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.

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

Expand All @@ -25,7 +30,7 @@ WARNING: Once you delete a saved object, _it cannot be recovered_.
[[saved-objects-api-delete-response-codes]]
==== Response code

`200`::
`200`::
Indicates a successful call.

==== Examples
Expand Down
14 changes: 11 additions & 3 deletions docs/api/saved-objects/export.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,23 @@ experimental[] Retrieve sets of saved objects that you want to import into {kib}

`POST /api/saved_objects/_export`

`POST /s/<space_id>/api/saved_objects/_export`

[[saved-objects-api-export-path-params]]
==== Path parameters

`space_id`::
(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.

[[saved-objects-api-export-request-request-body]]
==== Request body

`type`::
(Optional, array|string) The saved object types to include in the export.

`objects`::
(Optional, array) A list of objects to export.

`includeReferencesDeep`::
(Optional, boolean) Includes all of the referenced objects in the exported objects.

Expand Down Expand Up @@ -50,7 +58,7 @@ When `excludeExportDetails=false` (the default) we append an export result detai
[[export-objects-api-create-request-codes]]
==== Response code

`200`::
`200`::
Indicates a successful call.

[[ssaved-objects-api-create-example]]
Expand Down
27 changes: 17 additions & 10 deletions docs/api/saved-objects/find.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,41 @@ experimental[] Retrieve a paginated set of {kib} saved objects by various condit

`GET /api/saved_objects/_find`

`GET /s/<space_id>/api/saved_objects/_find`

[[saved-objects-api-find-path-params]]
==== Path parameters

`space_id`::
(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.

[[saved-objects-api-find-query-params]]
==== Query Parameters

`type`::
(Required, array|string) The saved object types to include in the export.

`per_page`::
(Optional, number) The number of objects to return per page.

`page`::
(Optional, number) The page of objects to return.

`search`::
(Optional, string) An Elasticsearch {ref}/query-dsl-simple-query-string-query.html[simple_query_string] query that filters the objects in the response.

`default_search_operator`::
(Optional, string) The default operator to use for the `simple_query_string`.

`search_fields`::
(Optional, array|string) The fields to perform the `simple_query_string` parsed query against.

`fields`::
(Optional, array|string) The fields to return in the response.

`sort_field`::
(Optional, string) The field that sorts the response.

`has_reference`::
(Optional, object) Filters to objects that have a relationship with the type and ID combination.

Expand All @@ -52,7 +60,7 @@ change. Use the find API for traditional paginated results, but avoid using it t
[[saved-objects-api-find-request-codes]]
==== Response code

`200`::
`200`::
Indicates a successful call.

==== Examples
Expand Down Expand Up @@ -92,4 +100,3 @@ query parameter for each value:
GET api/saved_objects/_find?fields=id&fields=title
--------------------------------------------------
// KIBANA

Loading

0 comments on commit e0aff7a

Please sign in to comment.