Merge branch 'master' into encode-decode-helper

elastic · Feb 2, 2021 · 8f3568f · 8f3568f
2 parents a64d53a + 5416379
commit 8f3568f
Show file tree

Hide file tree

Showing 72 changed files with 241 additions and 648 deletions.
diff --git a/...na-plugin-core-server.savedobjectserrorhelpers.createindexaliasnotfounderror.md b/...na-plugin-core-server.savedobjectserrorhelpers.createindexaliasnotfounderror.md
diff --git a/...-plugin-core-server.savedobjectserrorhelpers.decorateindexaliasnotfounderror.md b/...-plugin-core-server.savedobjectserrorhelpers.decorateindexaliasnotfounderror.md
diff --git a/...ore/server/kibana-plugin-core-server.savedobjectserrorhelpers.isgeneralerror.md b/...ore/server/kibana-plugin-core-server.savedobjectserrorhelpers.isgeneralerror.md
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.md
@@ -18,7 +18,6 @@ export declare class SavedObjectsErrorHelpers
 |  [createBadRequestError(reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.createbadrequesterror.md) | <code>static</code> |  |
 |  [createConflictError(type, id, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.createconflicterror.md) | <code>static</code> |  |
 |  [createGenericNotFoundError(type, id)](./kibana-plugin-core-server.savedobjectserrorhelpers.creategenericnotfounderror.md) | <code>static</code> |  |
-|  [createIndexAliasNotFoundError(alias)](./kibana-plugin-core-server.savedobjectserrorhelpers.createindexaliasnotfounderror.md) | <code>static</code> |  |
 |  [createInvalidVersionError(versionInput)](./kibana-plugin-core-server.savedobjectserrorhelpers.createinvalidversionerror.md) | <code>static</code> |  |
 |  [createTooManyRequestsError(type, id)](./kibana-plugin-core-server.savedobjectserrorhelpers.createtoomanyrequestserror.md) | <code>static</code> |  |
 |  [createUnsupportedTypeError(type)](./kibana-plugin-core-server.savedobjectserrorhelpers.createunsupportedtypeerror.md) | <code>static</code> |  |
@@ -28,7 +27,6 @@ export declare class SavedObjectsErrorHelpers
 |  [decorateEsUnavailableError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateesunavailableerror.md) | <code>static</code> |  |
 |  [decorateForbiddenError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateforbiddenerror.md) | <code>static</code> |  |
 |  [decorateGeneralError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorategeneralerror.md) | <code>static</code> |  |
-|  [decorateIndexAliasNotFoundError(error, alias)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateindexaliasnotfounderror.md) | <code>static</code> |  |
 |  [decorateNotAuthorizedError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decoratenotauthorizederror.md) | <code>static</code> |  |
 |  [decorateRequestEntityTooLargeError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decoraterequestentitytoolargeerror.md) | <code>static</code> |  |
 |  [decorateTooManyRequestsError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decoratetoomanyrequestserror.md) | <code>static</code> |  |
@@ -37,7 +35,6 @@ export declare class SavedObjectsErrorHelpers
 |  [isEsCannotExecuteScriptError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isescannotexecutescripterror.md) | <code>static</code> |  |
 |  [isEsUnavailableError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isesunavailableerror.md) | <code>static</code> |  |
 |  [isForbiddenError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isforbiddenerror.md) | <code>static</code> |  |
-|  [isGeneralError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isgeneralerror.md) | <code>static</code> |  |
 |  [isInvalidVersionError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isinvalidversionerror.md) | <code>static</code> |  |
 |  [isNotAuthorizedError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isnotauthorizederror.md) | <code>static</code> |  |
 |  [isNotFoundError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isnotfounderror.md) | <code>static</code> |  |

diff --git a/packages/kbn-es-archiver/src/actions/empty_kibana_index.ts b/packages/kbn-es-archiver/src/actions/empty_kibana_index.ts
@@ -25,6 +25,5 @@ export async function emptyKibanaIndexAction({
 
   await cleanKibanaIndices({ client, stats, log, kibanaPluginIds });
   await migrateKibanaIndex({ client, kbnClient });
-  stats.createdIndex('.kibana');
-  return stats.toJSON();
+  return stats;
 }
diff --git a/packages/kbn-es-archiver/src/es_archiver.ts b/packages/kbn-es-archiver/src/es_archiver.ts
@@ -155,7 +155,7 @@ export class EsArchiver {
    *  @return Promise
    */
   async emptyKibanaIndex() {
-    return await emptyKibanaIndexAction({
+    await emptyKibanaIndexAction({
       client: this.client,
       log: this.log,
       kbnClient: this.kbnClient,

diff --git a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
@@ -76,9 +76,7 @@ export async function migrateKibanaIndex({
  */
 async function fetchKibanaIndices(client: Client) {
   const kibanaIndices = await client.cat.indices({ index: '.kibana*', format: 'json' });
-  const isKibanaIndex = (index: string) =>
-    /^\.kibana(:?_\d*)?$/.test(index) ||
-    /^\.kibana(_task_manager)?_(pre)?\d+\.\d+\.\d+/.test(index);
+  const isKibanaIndex = (index: string) => /^\.kibana(:?_\d*)?$/.test(index);
   return kibanaIndices.map((x: { index: string }) => x.index).filter(isKibanaIndex);
 }
 
@@ -105,7 +103,7 @@ export async function cleanKibanaIndices({
 
   while (true) {
     const resp = await client.deleteByQuery({
-      index: `.kibana,.kibana_task_manager`,
+      index: `.kibana`,
       body: {
         query: {
           bool: {
@@ -117,7 +115,7 @@ export async function cleanKibanaIndices({
           },
         },
       },
-      ignore: [404, 409],
+      ignore: [409],
     });
 
     if (resp.total !== resp.deleted) {