Skip to content

Commit f2d7ccf

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into better-error-message
2 parents b022988 + 5c8dda2 commit f2d7ccf

634 files changed

Lines changed: 27198 additions & 18795 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.

‎.ci/Jenkinsfile_coverage‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ kibanaPipeline(timeoutMinutes: 180) {
4444
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4545
]),
4646
])
47-
workers.base(name: 'coverage-worker', label: 'tests-l', ramDisk: false, bootstrapped: false) {
47+
workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
4848
kibanaPipeline.downloadCoverageArtifacts()
4949
kibanaPipeline.bash(
5050
'''

‎.ci/Jenkinsfile_visual_baseline‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ kibanaPipeline(timeoutMinutes: 120) {
77
catchError {
88
parallel([
99
'oss-visualRegression': {
10-
workers.ci(name: 'oss-visualRegression', label: 'linux && immutable', ramDisk: false) {
10+
workers.ci(name: 'oss-visualRegression', size: 's', ramDisk: false) {
1111
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
1212
}
1313
},
1414
'xpack-visualRegression': {
15-
workers.ci(name: 'xpack-visualRegression', label: 'linux && immutable', ramDisk: false) {
15+
workers.ci(name: 'xpack-visualRegression', size: 's', ramDisk: false) {
1616
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
1717
}
1818
},

‎.ci/es-snapshots/Jenkinsfile_build_es‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
2525
timeout(time: 120, unit: 'MINUTES') {
2626
timestamps {
2727
ansiColor('xterm') {
28-
node('linux && immutable') {
28+
node(workers.label('s')) {
2929
catchErrors {
3030
def VERSION
3131
def SNAPSHOT_ID

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ kibanaPipeline(timeoutMinutes: 120) {
6161
}
6262

6363
def promoteSnapshot(snapshotVersion, snapshotId) {
64-
node('linux && immutable') {
64+
node(workers.label('s')) {
6565
esSnapshots.promote(snapshotVersion, snapshotId)
6666
}
6767
}

‎.github/CODEOWNERS‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,20 @@
1515
/src/legacy/core_plugins/metrics/ @elastic/kibana-app
1616
/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
1717
/src/legacy/core_plugins/vis_type_xy/ @elastic/kibana-app
18-
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
19-
/src/plugins/home/public @elastic/kibana-app
20-
/src/plugins/home/server/*.ts @elastic/kibana-app
21-
/src/plugins/home/server/services/ @elastic/kibana-app
22-
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
23-
/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-app
24-
/src/legacy/core_plugins/kibana/public/home/*.scss @elastic/kibana-app
25-
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-app
2618
/src/plugins/kibana_legacy/ @elastic/kibana-app
2719
/src/plugins/timelion/ @elastic/kibana-app
28-
/src/plugins/dev_tools/ @elastic/kibana-app
2920
/src/plugins/dashboard/ @elastic/kibana-app
21+
/src/plugins/discover/ @elastic/kibana-app
22+
23+
# Core UI
24+
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
25+
/src/plugins/home/public @elastic/kibana-core-ui
26+
/src/plugins/home/server/*.ts @elastic/kibana-core-ui
27+
/src/plugins/home/server/services/ @elastic/kibana-core-ui
28+
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
29+
/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-core-ui
30+
/src/legacy/core_plugins/kibana/public/home/*.scss @elastic/kibana-core-ui
31+
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
3032

3133
# App Architecture
3234
/examples/url_generators_examples/ @elastic/kibana-app-arch
@@ -175,6 +177,7 @@
175177
**/*.scss @elastic/kibana-design
176178

177179
# Elasticsearch UI
180+
/src/plugins/dev_tools/ @elastic/es-ui
178181
/src/plugins/console/ @elastic/es-ui
179182
/src/plugins/es_ui_shared/ @elastic/es-ui
180183
/x-pack/legacy/plugins/cross_cluster_replication/ @elastic/es-ui

‎docs/api/role-management/put.asciidoc‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ experimental[] Create a new {kib} role, or update the attributes of an existing
1717

1818
To use the create or update role API, you must have the `manage_security` cluster privilege.
1919

20+
[role="child_attributes"]
2021
[[role-management-api-response-body]]
2122
==== Request body
2223

@@ -29,8 +30,11 @@ To use the create or update role API, you must have the `manage_security` cluste
2930
{ref}/defining-roles.html[Defining roles].
3031

3132
`kibana`::
32-
(list) Objects that specify the <<kibana-privileges, Kibana privileges>> for the role:
33-
33+
(list) Objects that specify the <<kibana-privileges, Kibana privileges>> for the role.
34+
+
35+
.Properties of `kibana`
36+
[%collapsible%open]
37+
=====
3438
`base` :::
3539
(Optional, list) A base privilege. When specified, the base must be `["all"]` or `["read"]`.
3640
When the `base` privilege is specified, you are unable to use the `feature` section.
@@ -45,14 +49,15 @@ To use the create or update role API, you must have the `manage_security` cluste
4549
`spaces` :::
4650
(list) The spaces to apply the privileges to.
4751
To grant access to all spaces, set to `["*"]`, or omit the value.
52+
=====
4853

4954
[[role-management-api-put-response-codes]]
5055
==== Response code
5156

5257
`204`::
5358
Indicates a successful call.
5459

55-
===== Examples
60+
==== Examples
5661

5762
Grant access to various features in all spaces:
5863

‎docs/api/spaces-management/copy_saved_objects.asciidoc‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ You can request to overwrite any objects that already exist in the target space
2626
`space_id`::
2727
(Optional, string) The ID of the space that contains the saved objects you want to copy. When `space_id` is unspecified in the URL, the default space is used.
2828

29+
[role="child_attributes"]
2930
[[spaces-api-copy-saved-objects-request-body]]
3031
==== {api-request-body-title}
3132

@@ -34,38 +35,60 @@ You can request to overwrite any objects that already exist in the target space
3435

3536
`objects`::
3637
(Required, object array) The saved objects to copy.
38+
+
39+
.Properties of `objects`
40+
[%collapsible%open]
41+
=====
3742
`type`:::
3843
(Required, string) The saved object type.
44+
3945
`id`:::
4046
(Required, string) The saved object ID.
47+
=====
4148

4249
`includeReferences`::
4350
(Optional, boolean) When set to `true`, all saved objects related to the specified saved objects will also be copied into the target spaces. The default value is `false`.
4451

4552
`overwrite`::
4653
(Optional, boolean) When set to `true`, all conflicts are automatically overidden. When a saved object with a matching `type` and `id` exists in the target space, that version is replaced with the version from the source space. The default value is `false`.
4754

48-
55+
[role="child_attributes"]
4956
[[spaces-api-copy-saved-objects-response-body]]
5057
==== {api-response-body-title}
5158

5259
`<space_id>`::
5360
(object) An object that describes the result of the copy operation for the space. Includes the dynamic keys in the response.
61+
+
62+
.Properties of `<space_id>`
63+
[%collapsible%open]
64+
=====
5465
`success`:::
5566
(boolean) The copy operation was successful. When set to `false`, some objects may have been copied. For additional information, refer to the `successCount` and `errors` properties.
67+
5668
`successCount`:::
5769
(number) The number of objects that successfully copied.
70+
5871
`errors`:::
59-
(Optional, array) The errors that occurred during the copy operation. When errors are reported, the `success` flag is set to `false`.v
72+
(Optional, array) The errors that occurred during the copy operation. When errors are reported, the `success` flag is set to `false`.
73+
+
74+
.Properties of `errors`
75+
[%collapsible%open]
76+
======
6077
`id`::::
6178
(string) The saved object ID that failed to copy.
6279
`type`::::
6380
(string) The type of saved object that failed to copy.
6481
`error`::::
6582
(object) The error that caused the copy operation to fail.
83+
+
84+
.Properties of `error`
85+
[%collapsible%open]
86+
=======
6687
`type`:::::
6788
(string) The type of error. For example, `unsupported_type`, `missing_references`, or `unknown`. Errors marked as `conflict` may be resolved by using the <<spaces-api-resolve-copy-saved-objects-conflicts, Resolve copy saved objects conflicts API>>.
68-
89+
=======
90+
======
91+
=====
6992
[[spaces-api-copy-saved-objects-example]]
7093
==== {api-examples-title}
7194

‎docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,51 +25,89 @@ Execute the <<spaces-api-copy-saved-objects,copy saved objects to space API>>, w
2525
`space_id`::
2626
(Optional, string) The ID of the space that contains the saved objects you want to copy. When `space_id` is unspecified in the URL, the default space is used. The `space_id` must be the same value used during the failed <<spaces-api-copy-saved-objects, copy saved objects to space API>> operation.
2727

28+
[role="child_attributes"]
2829
[[spaces-api-resolve-copy-saved-objects-conflicts-request-body]]
2930
==== {api-request-body-title}
3031

3132
`objects`::
3233
(Required, object array) The saved objects to copy. The `objects` must be the same values used during the failed <<spaces-api-copy-saved-objects, copy saved objects to space API>> operation.
34+
+
35+
.Properties of `objects`
36+
[%collapsible%open]
37+
=====
3338
`type`:::
3439
(Required, string) The saved object type.
40+
3541
`id`:::
3642
(Required, string) The saved object ID.
43+
=====
3744

3845
`includeReferences`::
3946
(Optional, boolean) When set to `true`, all saved objects related to the specified saved objects are copied into the target spaces. The `includeReferences` must be the same values used during the failed <<spaces-api-copy-saved-objects, copy saved objects to space API>> operation. The default value is `false`.
4047

4148
`retries`::
4249
(Required, object) The retry operations to attempt. Object keys represent the target space IDs.
50+
+
51+
.Properties of `retries`
52+
[%collapsible%open]
53+
=====
4354
`<space_id>`:::
4455
(Required, array) The errors to resolve for the specified `<space_id>`.
56+
+
57+
58+
.Properties of `<space_id>`
59+
[%collapsible%open]
60+
======
4561
`type`::::
4662
(Required, string) The saved object type.
4763
`id`::::
4864
(Required, string) The saved object ID.
4965
`overwrite`::::
5066
(Required, boolean) When set to `true`, the saved object from the source space (desigated by the <<spaces-api-resolve-copy-saved-objects-conflicts-path-params, `space_id` path parameter>>) overwrites the conflicting object in the destination space. When set to `false`, this does nothing.
67+
======
68+
=====
5169

52-
70+
[role="child_attributes"]
5371
[[spaces-api-resolve-copy-saved-objects-conflicts-response-body]]
5472
==== {api-response-body-title}
5573

5674
`<space_id>`::
5775
(object) An object that describes the result of the copy operation for the space. Includes the dynamic keys in the response.
76+
+
77+
.Properties of `<space_id>`
78+
[%collapsible%open]
79+
=====
5880
`success`:::
5981
(boolean) The copy operation was successful. When set to `false`, some objects may have been copied. For additional information, refer to the `successCount` and `errors` properties.
82+
6083
`successCount`:::
6184
(number) The number of objects that successfully copied.
85+
6286
`errors`:::
6387
(Optional, array) The errors that occurred during the copy operation. When errors are reported, the `success` flag is set to `false`.
88+
+
89+
90+
.Properties of `errors`
91+
[%collapsible%open]
92+
======
6493
`id`::::
6594
(string) The saved object ID that failed to copy.
95+
6696
`type`::::
6797
(string) The type of saved object that failed to copy.
98+
6899
`error`::::
69100
(object) The error that caused the copy operation to fail.
101+
+
102+
103+
.Properties of `error`
104+
[%collapsible%open]
105+
=======
70106
`type`:::::
71107
(string) The type of error. For example, `unsupported_type`, `missing_references`, or `unknown`.
72-
108+
=======
109+
======
110+
=====
73111

74112
[[spaces-api-resolve-copy-saved-objects-conflicts-example]]
75113
==== {api-examples-title}

‎docs/apm/api.asciidoc‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,22 @@ The following Agent configuration APIs are available:
3838

3939
`PUT /api/apm/settings/agent-configuration`
4040

41+
[role="child_attributes"]
4142
[[apm-update-config-req-body]]
4243
===== Request body
4344

4445
`service`::
4546
(required, object) Service identifying the configuration to create or update.
4647

48+
.Properties of `service`
49+
[%collapsible%open]
50+
======
4751
`name` :::
4852
(required, string) Name of service
4953
5054
`environment` :::
5155
(optional, string) Environment of service
56+
======
5257

5358
`settings`::
5459
(required) Key/value object with settings and their corresponding value.
@@ -90,16 +95,21 @@ PUT /api/apm/settings/agent-configuration
9095

9196
`DELETE /api/apm/settings/agent-configuration`
9297

98+
[role="child_attributes"]
9399
[[apm-delete-config-req-body]]
94100
===== Request body
95101
`service`::
96102
(required, object) Service identifying the configuration to delete
97103

104+
.Properties of `service`
105+
[%collapsible%open]
106+
======
98107
`name` :::
99108
(required, string) Name of service
100109
101110
`environment` :::
102111
(optional, string) Environment of service
112+
======
103113

104114

105115
[[apm-delete-config-example]]
@@ -201,17 +211,22 @@ GET /api/apm/settings/agent-configuration
201211

202212
`POST /api/apm/settings/agent-configuration/search`
203213

214+
[role="child_attributes"]
204215
[[apm-search-config-req-body]]
205216
===== Request body
206217

207218
`service`::
208219
(required, object) Service identifying the configuration.
209220

221+
.Properties of `service`
222+
[%collapsible%open]
223+
======
210224
`name` :::
211225
(required, string) Name of service
212226
213227
`environment` :::
214228
(optional, string) Environment of service
229+
======
215230

216231
`etag`::
217232
(required) etag is sent by the agent to indicate the etag of the last successfully applied configuration. If the etag matches an existing configuration its `applied_by_agent` property will be set to `true`. Every time a configuration is edited `applied_by_agent` is reset to `false`.

‎docs/infrastructure/index.asciidoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ You can optionally save these views and add them to {kibana-ref}/dashboard.html[
2121

2222
* Seamlessly switch to view the corresponding logs, application traces or uptime information for a component.
2323

24+
* Create alerts based on metric thresholds for one or more components.
25+
2426
To get started, you need to <<xpack-metrics-getting-started, start collecting metrics data from your infrastructure>>. Then you can <<infra-ui, use the Metrics application to inspect and analyze your data>>.
2527

2628
[role="screenshot"]

0 commit comments

Comments
 (0)