Skip to content

Commit c09eb74

Browse files
TinaHeiligersTinaHeiligers
committed
Merge branch 'master' into ts-project-refs/index_pattern_management
2 parents 11f98f9 + 688b918 commit c09eb74

File tree

224 files changed

+6702
-2900
lines changed

Some content is hidden

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

224 files changed

+6702
-2900
lines changed

‎docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.createindexaliasnotfounderror.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsErrorHelpers](./kibana-plugin-core-server.savedobjectserrorhelpers.md) &gt; [createIndexAliasNotFoundError](./kibana-plugin-core-server.savedobjectserrorhelpers.createindexaliasnotfounderror.md)
4+
5+
## SavedObjectsErrorHelpers.createIndexAliasNotFoundError() method
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
static createIndexAliasNotFoundError(alias: string): DecoratedError;
11+
```
12+
13+
## Parameters
14+
15+
| Parameter | Type | Description |
16+
| --- | --- | --- |
17+
| alias | <code>string</code> | |
18+
19+
<b>Returns:</b>
20+
21+
`DecoratedError`
22+

‎docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.decorateindexaliasnotfounderror.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsErrorHelpers](./kibana-plugin-core-server.savedobjectserrorhelpers.md) &gt; [decorateIndexAliasNotFoundError](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateindexaliasnotfounderror.md)
4+
5+
## SavedObjectsErrorHelpers.decorateIndexAliasNotFoundError() method
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
static decorateIndexAliasNotFoundError(error: Error, alias: string): DecoratedError;
11+
```
12+
13+
## Parameters
14+
15+
| Parameter | Type | Description |
16+
| --- | --- | --- |
17+
| error | <code>Error</code> | |
18+
| alias | <code>string</code> | |
19+
20+
<b>Returns:</b>
21+
22+
`DecoratedError`
23+

‎docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.isgeneralerror.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsErrorHelpers](./kibana-plugin-core-server.savedobjectserrorhelpers.md) &gt; [isGeneralError](./kibana-plugin-core-server.savedobjectserrorhelpers.isgeneralerror.md)
4+
5+
## SavedObjectsErrorHelpers.isGeneralError() method
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
static isGeneralError(error: Error | DecoratedError): boolean;
11+
```
12+
13+
## Parameters
14+
15+
| Parameter | Type | Description |
16+
| --- | --- | --- |
17+
| error | <code>Error &#124; DecoratedError</code> | |
18+
19+
<b>Returns:</b>
20+
21+
`boolean`
22+

‎docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export declare class SavedObjectsErrorHelpers
1818
| [createBadRequestError(reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.createbadrequesterror.md) | <code>static</code> | |
1919
| [createConflictError(type, id, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.createconflicterror.md) | <code>static</code> | |
2020
| [createGenericNotFoundError(type, id)](./kibana-plugin-core-server.savedobjectserrorhelpers.creategenericnotfounderror.md) | <code>static</code> | |
21+
| [createIndexAliasNotFoundError(alias)](./kibana-plugin-core-server.savedobjectserrorhelpers.createindexaliasnotfounderror.md) | <code>static</code> | |
2122
| [createInvalidVersionError(versionInput)](./kibana-plugin-core-server.savedobjectserrorhelpers.createinvalidversionerror.md) | <code>static</code> | |
2223
| [createTooManyRequestsError(type, id)](./kibana-plugin-core-server.savedobjectserrorhelpers.createtoomanyrequestserror.md) | <code>static</code> | |
2324
| [createUnsupportedTypeError(type)](./kibana-plugin-core-server.savedobjectserrorhelpers.createunsupportedtypeerror.md) | <code>static</code> | |
@@ -27,6 +28,7 @@ export declare class SavedObjectsErrorHelpers
2728
| [decorateEsUnavailableError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateesunavailableerror.md) | <code>static</code> | |
2829
| [decorateForbiddenError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateforbiddenerror.md) | <code>static</code> | |
2930
| [decorateGeneralError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorategeneralerror.md) | <code>static</code> | |
31+
| [decorateIndexAliasNotFoundError(error, alias)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateindexaliasnotfounderror.md) | <code>static</code> | |
3032
| [decorateNotAuthorizedError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decoratenotauthorizederror.md) | <code>static</code> | |
3133
| [decorateRequestEntityTooLargeError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decoraterequestentitytoolargeerror.md) | <code>static</code> | |
3234
| [decorateTooManyRequestsError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decoratetoomanyrequestserror.md) | <code>static</code> | |
@@ -35,6 +37,7 @@ export declare class SavedObjectsErrorHelpers
3537
| [isEsCannotExecuteScriptError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isescannotexecutescripterror.md) | <code>static</code> | |
3638
| [isEsUnavailableError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isesunavailableerror.md) | <code>static</code> | |
3739
| [isForbiddenError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isforbiddenerror.md) | <code>static</code> | |
40+
| [isGeneralError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isgeneralerror.md) | <code>static</code> | |
3841
| [isInvalidVersionError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isinvalidversionerror.md) | <code>static</code> | |
3942
| [isNotAuthorizedError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isnotauthorizederror.md) | <code>static</code> | |
4043
| [isNotFoundError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isnotfounderror.md) | <code>static</code> | |

‎packages/kbn-es-archiver/src/actions/empty_kibana_index.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ export async function emptyKibanaIndexAction({
2525

2626
await cleanKibanaIndices({ client, stats, log, kibanaPluginIds });
2727
await migrateKibanaIndex({ client, kbnClient });
28-
return stats;
28+
stats.createdIndex('.kibana');
29+
return stats.toJSON();
2930
}

‎packages/kbn-es-archiver/src/es_archiver.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ export class EsArchiver {
155155
* @return Promise
156156
*/
157157
async emptyKibanaIndex() {
158-
await emptyKibanaIndexAction({
158+
return await emptyKibanaIndexAction({
159159
client: this.client,
160160
log: this.log,
161161
kbnClient: this.kbnClient,

‎packages/kbn-es-archiver/src/lib/indices/kibana_index.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ export async function migrateKibanaIndex({
7676
*/
7777
async function fetchKibanaIndices(client: Client) {
7878
const kibanaIndices = await client.cat.indices({ index: '.kibana*', format: 'json' });
79-
const isKibanaIndex = (index: string) => /^\.kibana(:?_\d*)?$/.test(index);
79+
const isKibanaIndex = (index: string) =>
80+
/^\.kibana(:?_\d*)?$/.test(index) ||
81+
/^\.kibana(_task_manager)?_(pre)?\d+\.\d+\.\d+/.test(index);
8082
return kibanaIndices.map((x: { index: string }) => x.index).filter(isKibanaIndex);
8183
}
8284

@@ -103,7 +105,7 @@ export async function cleanKibanaIndices({
103105

104106
while (true) {
105107
const resp = await client.deleteByQuery({
106-
index: `.kibana`,
108+
index: `.kibana,.kibana_task_manager`,
107109
body: {
108110
query: {
109111
bool: {
@@ -115,7 +117,7 @@ export async function cleanKibanaIndices({
115117
},
116118
},
117119
},
118-
ignore: [409],
120+
ignore: [404, 409],
119121
});
120122

121123
if (resp.total !== resp.deleted) {

‎packages/kbn-optimizer/limits.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pageLoadAssetSize:
3434
indexLifecycleManagement: 107090
3535
indexManagement: 140608
3636
indexPatternManagement: 154222
37-
infra: 197873
37+
infra: 204800
3838
fleet: 415829
3939
ingestPipelines: 58003
4040
inputControlVis: 172675

0 commit comments

Comments
 (0)