Skip to content

Commit b3ec447

Browse files
tsullivantsullivan
committed
Merge branch 'master' into reporting/np-server-config
2 parents 6bcd58d + d896292 commit b3ec447

File tree

1,012 files changed

+13885
-6864
lines changed

Some content is hidden

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

1,012 files changed

+13885
-6864
lines changed

‎.github/workflows/pr-project-assigner.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
with:
1414
issue-mappings: |
1515
[
16-
{ "label": "Team:AppArch", "projectNumber": 37, "columnName": "Review in progress" },
17-
{ "label": "Feature:Lens", "projectNumber": 32, "columnName": "In progress" },
18-
{ "label": "Team:Canvas", "projectNumber": 38, "columnName": "Review in progress" }
1916
]
2017
ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
2118

19+
# { "label": "Team:AppArch", "projectNumber": 37, "columnName": "Review in progress" },
20+
# { "label": "Feature:Lens", "projectNumber": 32, "columnName": "In progress" },
21+
# { "label": "Team:Canvas", "projectNumber": 38, "columnName": "Review in progress" }

‎.sass-lint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ files:
77
- 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
88
- 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
99
- 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
10+
- 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'
1011
ignore:
1112
- 'x-pack/legacy/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
1213
- 'x-pack/legacy/plugins/lens/**/*.s+(a|c)ss'

‎docs/api/upgrade-assistant.asciidoc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@ The following upgrade assistant APIs are available:
1010

1111
* <<start-resume-reindex, Start or resume reindex API>> to start a new reindex or resume a paused reindex
1212

13+
* <<batch-start-resume-reindex, Batch start or resume reindex API>> to start or resume multiple reindex tasks
14+
15+
* <<batch-reindex-queue, Batch reindex queue API>> to check the current reindex batch queue
16+
1317
* <<check-reindex-status, Check reindex status API>> to check the status of the reindex operation
1418

1519
* <<cancel-reindex, Cancel reindex API>> to cancel reindexes that are waiting for the Elasticsearch reindex task to complete
1620

1721
include::upgrade-assistant/status.asciidoc[]
1822
include::upgrade-assistant/reindexing.asciidoc[]
23+
include::upgrade-assistant/batch_reindexing.asciidoc[]
24+
include::upgrade-assistant/batch_queue.asciidoc[]
1925
include::upgrade-assistant/check_reindex_status.asciidoc[]
2026
include::upgrade-assistant/cancel_reindex.asciidoc[]

‎docs/api/upgrade-assistant/batch_queue.asciidoc‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
[[batch-reindex-queue]]
2+
=== Batch reindex queue API
3+
++++
4+
<titleabbrev>Batch reindex queue</titleabbrev>
5+
++++
6+
7+
experimental["The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are experimental."]
8+
9+
Check the current reindex batch queue.
10+
11+
[[batch-reindex-queue-request]]
12+
==== Request
13+
14+
`GET /api/upgrade_assistant/reindex/batch/queue`
15+
16+
[[batch-reindex-queue-request-codes]]
17+
==== Response code
18+
19+
`200`::
20+
Indicates a successful call.
21+
22+
[[batch-reindex-queue-example]]
23+
==== Example
24+
25+
The API returns the following:
26+
27+
[source,js]
28+
--------------------------------------------------
29+
{
30+
"queue": [ <1>
31+
{
32+
"indexName": "index1",
33+
"newIndexName": "reindexed-v8-index2",
34+
"status": 3,
35+
"lastCompletedStep": 0,
36+
"locked": null,
37+
"reindexTaskId": null,
38+
"reindexTaskPercComplete": null,
39+
"errorMessage": null,
40+
"runningReindexCount": null,
41+
"reindexOptions": {
42+
"queueSettings": {
43+
"queuedAt": 1583406985489
44+
}
45+
}
46+
},
47+
{
48+
"indexName": "index2",
49+
"newIndexName": "reindexed-v8-index2",
50+
"status": 3,
51+
"lastCompletedStep": 0,
52+
"locked": null,
53+
"reindexTaskId": null,
54+
"reindexTaskPercComplete": null,
55+
"errorMessage": null,
56+
"runningReindexCount": null,
57+
"reindexOptions": {
58+
"queueSettings": {
59+
"queuedAt": 1583406987334
60+
}
61+
}
62+
}
63+
]
64+
}
65+
--------------------------------------------------
66+
67+
<1> Items in this array indicate reindex tasks at a given point in time and the order in which they will be executed.
68+

‎docs/api/upgrade-assistant/batch_reindexing.asciidoc‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
[[batch-start-resume-reindex]]
2+
=== Batch start or resume reindex API
3+
++++
4+
<titleabbrev>Batch start or resume reindex</titleabbrev>
5+
++++
6+
7+
experimental["The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are experimental."]
8+
9+
Start or resume multiple reindexing tasks in one request. Additionally, reindexing tasks started or resumed
10+
via the batch endpoint will be placed on a queue and executed one-by-one, which ensures that minimal cluster resources
11+
are consumed over time.
12+
13+
[[batch-start-resume-reindex-request]]
14+
==== Request
15+
16+
`POST /api/upgrade_assistant/reindex/batch`
17+
18+
[[batch-start-resume-reindex-request-body]]
19+
==== Request body
20+
21+
`indexNames`::
22+
(Required, array) The list of index names to be reindexed.
23+
24+
[[batch-start-resume-reindex-codes]]
25+
==== Response code
26+
27+
`200`::
28+
Indicates a successful call.
29+
30+
[[batch-start-resume-example]]
31+
==== Example
32+
33+
[source,js]
34+
--------------------------------------------------
35+
POST /api/upgrade_assistant/reindex/batch
36+
{
37+
"indexNames": [ <1>
38+
"index1",
39+
"index2"
40+
]
41+
}
42+
--------------------------------------------------
43+
<1> The order in which the indices are provided here determines the order in which the reindex tasks will be executed.
44+
45+
Similar to the <<start-resume-reindex, start or resume endpoint>>, the API returns the following:
46+
47+
[source,js]
48+
--------------------------------------------------
49+
{
50+
"enqueued": [ <1>
51+
{
52+
"indexName": "index1",
53+
"newIndexName": "reindexed-v8-index1",
54+
"status": 3,
55+
"lastCompletedStep": 0,
56+
"locked": null,
57+
"reindexTaskId": null,
58+
"reindexTaskPercComplete": null,
59+
"errorMessage": null,
60+
"runningReindexCount": null,
61+
"reindexOptions": { <2>
62+
"queueSettings": {
63+
"queuedAt": 1583406985489 <3>
64+
}
65+
}
66+
}
67+
],
68+
"errors": [ <4>
69+
{
70+
"indexName": "index2",
71+
"message": "Something went wrong!"
72+
}
73+
]
74+
}
75+
--------------------------------------------------
76+
77+
<1> A list of reindex operations created, the order in the array indicates the order in which tasks will be executed.
78+
<2> Presence of this key indicates that the reindex job will occur in the batch.
79+
<3> A Unix timestamp of when the reindex task was placed in the queue.
80+
<4> A list of errors that may have occurred preventing the reindex task from being created.
81+

‎docs/api/upgrade-assistant/cancel_reindex.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<titleabbrev>Cancel reindex</titleabbrev>
55
++++
66

7-
Cancel reindexes that are waiting for the Elasticsearch reindex task to complete. For example, `lastCompletedStep` set to `40`.
8-
97
experimental["The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are experimental."]
108

9+
Cancel reindexes that are waiting for the Elasticsearch reindex task to complete. For example, `lastCompletedStep` set to `40`.
10+
1111
[[cancel-reindex-request]]
1212
==== Request
1313

‎docs/api/upgrade-assistant/check_reindex_status.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<titleabbrev>Check reindex status</titleabbrev>
55
++++
66

7-
Check the status of the reindex operation.
8-
97
experimental["The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are experimental."]
108

9+
Check the status of the reindex operation.
10+
1111
[[check-reindex-status-request]]
1212
==== Request
1313

‎docs/api/upgrade-assistant/reindexing.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<titleabbrev>Start or resume reindex</titleabbrev>
55
++++
66

7-
Start a new reindex or resume a paused reindex.
8-
97
experimental["The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are experimental."]
108

9+
Start a new reindex or resume a paused reindex.
10+
1111
[[start-resume-reindex-request]]
1212
==== Request
1313

‎docs/api/upgrade-assistant/status.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<titleabbrev>Upgrade readiness status</titleabbrev>
55
++++
66

7-
Check the status of your cluster.
8-
97
experimental["The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are experimental."]
108

9+
Check the status of your cluster.
10+
1111
[[upgrade-assistant-api-status-request]]
1212
==== Request
1313

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
## ErrorToastOptions interface
66

7-
Options available for [IToasts](./kibana-plugin-core-public.itoasts.md) APIs.
7+
Options available for [IToasts](./kibana-plugin-core-public.itoasts.md) error APIs.
88

99
<b>Signature:</b>
1010

1111
```typescript
12-
export interface ErrorToastOptions
12+
export interface ErrorToastOptions extends ToastOptions
1313
```
1414
1515
## Properties

0 commit comments

Comments
 (0)