Merge branch 'master' into move-maps-from-tests-folder

Author: kibanamachine

package.json

@@ -352,7 +352,7 @@
     "@babel/traverse": "^7.11.5",
     "@babel/types": "^7.11.0",
     "@cypress/snapshot": "^2.1.7",
-    "@cypress/webpack-preprocessor": "^5.4.11",
+    "@cypress/webpack-preprocessor": "^5.5.0",
     "@elastic/apm-rum": "^5.6.1",
     "@elastic/apm-rum-react": "^1.2.5",
     "@elastic/charts": "24.4.0",
@@ -607,7 +607,7 @@
     "cpy": "^8.1.1",
     "cronstrue": "^1.51.0",
     "css-loader": "^3.4.2",
-    "cypress": "^6.1.0",
+    "cypress": "^6.2.1",
     "cypress-cucumber-preprocessor": "^2.5.2",
     "cypress-multi-reporters": "^1.4.0",
     "d3": "3.5.17",

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

@@ -20,7 +20,7 @@
 import { Client } from 'elasticsearch';
 import { ToolingLog, KbnClient } from '@kbn/dev-utils';
 
-import { migrateKibanaIndex, deleteKibanaIndices, createStats } from '../lib';
+import { migrateKibanaIndex, createStats, cleanKibanaIndices } from '../lib';
 
 export async function emptyKibanaIndexAction({
   client,
@@ -32,8 +32,9 @@ export async function emptyKibanaIndexAction({
   kbnClient: KbnClient;
 }) {
   const stats = createStats('emptyKibanaIndex', log);
+  const kibanaPluginIds = await kbnClient.plugins.getEnabledIds();
 
-  await deleteKibanaIndices({ client, stats, log });
+  await cleanKibanaIndices({ client, stats, log, kibanaPluginIds });
   await migrateKibanaIndex({ client, kbnClient });
   return stats;
 }

packages/kbn-es-archiver/src/lib/index.ts

@@ -25,6 +25,7 @@ export {
   createGenerateIndexRecordsStream,
   deleteKibanaIndices,
   migrateKibanaIndex,
+  cleanKibanaIndices,
   createDefaultSpace,
 } from './indices';
 

packages/kbn-es-archiver/src/lib/indices/index.ts

@@ -20,4 +20,9 @@
 export { createCreateIndexStream } from './create_index_stream';
 export { createDeleteIndexStream } from './delete_index_stream';
 export { createGenerateIndexRecordsStream } from './generate_index_records_stream';
-export { migrateKibanaIndex, deleteKibanaIndices, createDefaultSpace } from './kibana_index';
+export {
+  migrateKibanaIndex,
+  deleteKibanaIndices,
+  cleanKibanaIndices,
+  createDefaultSpace,
+} from './kibana_index';

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

@@ -73,6 +73,7 @@ export async function migrateKibanaIndex({
     body: {
       dynamic: true,
     },
+    ignore: [404],
   } as any);
 
   await kbnClient.savedObjects.migrate();

src/dev/run_find_plugins_with_circular_deps.ts

@@ -31,7 +31,6 @@ interface Options {
 type CircularDepList = Set<string>;
 
 const allowedList: CircularDepList = new Set([
-  'src/plugins/vis_default_editor -> src/plugins/visualizations',
   'src/plugins/visualizations -> src/plugins/visualize',
   'x-pack/plugins/actions -> x-pack/plugins/case',
   'x-pack/plugins/case -> x-pack/plugins/security_solution',

src/plugins/data/public/ui/filter_bar/filter_item.tsx

@@ -153,7 +153,14 @@ export function FilterItem(props: Props) {
     const dataTestSubjNegated = filter.meta.negate ? 'filter-negated' : '';
     const dataTestSubjDisabled = `filter-${isDisabled(labelConfig) ? 'disabled' : 'enabled'}`;
     const dataTestSubjPinned = `filter-${isFilterPinned(filter) ? 'pinned' : 'unpinned'}`;
-    return `filter ${dataTestSubjDisabled} ${dataTestSubjKey} ${dataTestSubjValue} ${dataTestSubjPinned} ${dataTestSubjNegated}`;
+    return classNames(
+      'filter',
+      dataTestSubjDisabled,
+      dataTestSubjKey,
+      dataTestSubjValue,
+      dataTestSubjPinned,
+      dataTestSubjNegated
+    );
   }
 
   function getPanels() {

src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups.ts

@@ -96,11 +96,22 @@ export async function rollDailyData(logger: Logger, savedObjectsClient?: ISavedO
           })),
           { overwrite: true }
         );
-        await Promise.all(
+        const promiseStatuses = await Promise.allSettled(
           rawApplicationUsageTransactional.map(
             ({ id }) => savedObjectsClient.delete(SAVED_OBJECTS_TRANSACTIONAL_TYPE, id) // There is no bulkDelete :(
           )
         );
+        const rejectedPromises = promiseStatuses.filter(
+          (settledResult): settledResult is PromiseRejectedResult =>
+            settledResult.status === 'rejected'
+        );
+        if (rejectedPromises.length > 0) {
+          throw new Error(
+            `Failed to delete some items in ${SAVED_OBJECTS_TRANSACTIONAL_TYPE}: ${JSON.stringify(
+              rejectedPromises.map(({ reason }) => reason)
+            )}`
+          );
+        }
       }
     } while (toCreate.size > 0);
   } catch (err) {

src/plugins/management/tsconfig.json

@@ -0,0 +1,22 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "common/**/*",
+    "public/**/*",
+    "server/**/*",
+    "../../../typings/**/*"
+  ],
+  "references": [
+    { "path": "../../core/tsconfig.json" },
+    { "path": "../home/tsconfig.json"},
+    { "path": "../kibana_react/tsconfig.json"},
+    { "path": "../kibana_utils/tsconfig.json"}
+  ]
+}

src/plugins/region_map/kibana.json

@@ -15,7 +15,7 @@
   ],
   "requiredBundles": [
     "kibanaUtils",
-    "charts", 
+    "charts",
     "visDefaultEditor"
   ]
 }