Merge branch 'main' of github.com:elastic/kibana into implement/ftr-c…

…cs-support
elastic · Mar 7, 2022 · f69b556 · f69b556
2 parents 845a8bb + c0a653d
commit f69b556
Show file tree

Hide file tree

Showing 196 changed files with 3,040 additions and 1,767 deletions.
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearchclient.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearchclient.md
@@ -9,5 +9,5 @@ Client used to query the elasticsearch cluster.
 <b>Signature:</b>
 
 ```typescript
-export declare type ElasticsearchClient = Omit<Client, 'connectionPool' | 'serializer' | 'extend' | 'child' | 'close' | 'diagnostic'>;
+export declare type ElasticsearchClient = Omit<Client, 'connectionPool' | 'serializer' | 'extend' | 'close' | 'diagnostic'>;
 ```
diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts
@@ -196,6 +196,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
       std_dev: `${ELASTICSEARCH_DOCS}search-aggregations-metrics-extendedstats-aggregation.html`,
       sum: `${ELASTICSEARCH_DOCS}search-aggregations-metrics-sum-aggregation.html`,
       top_hits: `${ELASTICSEARCH_DOCS}search-aggregations-metrics-top-hits-aggregation.html`,
+      top_metrics: `${ELASTICSEARCH_DOCS}search-aggregations-metrics-top-metrics.html`,
     },
     runtimeFields: {
       overview: `${ELASTICSEARCH_DOCS}runtime.html`,

diff --git a/packages/kbn-type-summarizer/src/lib/source_mapper.ts b/packages/kbn-type-summarizer/src/lib/source_mapper.ts
@@ -17,26 +17,25 @@ import { tryReadFile } from './helpers/fs';
 import { parseJson } from './helpers/json';
 import { isNodeModule } from './is_node_module';
 
+type SourceMapConsumerEntry = [ts.SourceFile, BasicSourceMapConsumer | undefined];
+
 export class SourceMapper {
   static async forSourceFiles(
     log: Logger,
     dtsDir: string,
     repoRelativePackageDir: string,
     sourceFiles: readonly ts.SourceFile[]
   ) {
-    const consumers = new Map<ts.SourceFile, BasicSourceMapConsumer | undefined>();
-
-    await Promise.all(
-      sourceFiles.map(async (sourceFile) => {
+    const entries = await Promise.all(
+      sourceFiles.map(async (sourceFile): Promise<undefined | SourceMapConsumerEntry> => {
         if (isNodeModule(dtsDir, sourceFile.fileName)) {
           return;
         }
 
         const text = sourceFile.getText();
         const match = text.match(/^\/\/#\s*sourceMappingURL=(.*)/im);
         if (!match) {
-          consumers.set(sourceFile, undefined);
-          return;
+          return [sourceFile, undefined];
         }
 
         const relSourceFile = Path.relative(process.cwd(), sourceFile.fileName);
@@ -50,11 +49,16 @@ export class SourceMapper {
         }
 
         const json = parseJson(sourceJson, `source map at [${relSourceMapPath}]`);
-        consumers.set(sourceFile, await new SourceMapConsumer(json));
-        log.debug('loaded sourcemap for', relSourceFile);
+        return [sourceFile, await new SourceMapConsumer(json)];
       })
     );
 
+    const consumers = new Map(entries.filter((e): e is SourceMapConsumerEntry => !!e));
+    log.debug(
+      'loaded sourcemaps for',
+      Array.from(consumers.keys()).map((s) => Path.relative(process.cwd(), s.fileName))
+    );
+
     return new SourceMapper(consumers, repoRelativePackageDir);
   }
 

diff --git a/packages/kbn-type-summarizer/tests/integration_tests/class.test.ts b/packages/kbn-type-summarizer/tests/integration_tests/class.test.ts
@@ -69,7 +69,7 @@ it('prints basic class correctly', async () => {
     }
   `);
   expect(output.logs).toMatchInlineSnapshot(`
-    "debug loaded sourcemap for packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts
+    "debug loaded sourcemaps for [ 'packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts' ]
     debug Ignoring 1 global declarations for \\"Record\\"
     debug Ignoring 5 global declarations for \\"Promise\\"
     "

diff --git a/packages/kbn-type-summarizer/tests/integration_tests/function.test.ts b/packages/kbn-type-summarizer/tests/integration_tests/function.test.ts
@@ -74,8 +74,10 @@ it('prints the function declaration, including comments', async () => {
     }
   `);
   expect(result.logs).toMatchInlineSnapshot(`
-    "debug loaded sourcemap for packages/kbn-type-summarizer/tests/__tmp__/dist_dts/bar.d.ts
-    debug loaded sourcemap for packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts
+    "debug loaded sourcemaps for [
+      'packages/kbn-type-summarizer/tests/__tmp__/dist_dts/bar.d.ts',
+      'packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts'
+    ]
     "
   `);
 });
diff --git a/packages/kbn-type-summarizer/tests/integration_tests/import_boundary.test.ts b/packages/kbn-type-summarizer/tests/integration_tests/import_boundary.test.ts
@@ -52,7 +52,7 @@ it('output type links to named import from node modules', async () => {
     }
   `);
   expect(output.logs).toMatchInlineSnapshot(`
-    "debug loaded sourcemap for packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts
+    "debug loaded sourcemaps for [ 'packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts' ]
     "
   `);
 });
@@ -84,7 +84,7 @@ it('output type links to default import from node modules', async () => {
     }
   `);
   expect(output.logs).toMatchInlineSnapshot(`
-    "debug loaded sourcemap for packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts
+    "debug loaded sourcemaps for [ 'packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts' ]
     "
   `);
 });
diff --git a/packages/kbn-type-summarizer/tests/integration_tests/interface.test.ts b/packages/kbn-type-summarizer/tests/integration_tests/interface.test.ts
@@ -55,7 +55,7 @@ it('prints the whole interface, including comments', async () => {
     }
   `);
   expect(result.logs).toMatchInlineSnapshot(`
-    "debug loaded sourcemap for packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts
+    "debug loaded sourcemaps for [ 'packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts' ]
     debug Ignoring 5 global declarations for \\"Promise\\"
     "
   `);

diff --git a/packages/kbn-type-summarizer/tests/integration_tests/references.test.ts b/packages/kbn-type-summarizer/tests/integration_tests/references.test.ts
@@ -59,9 +59,11 @@ it('collects references from source files which contribute to result', async ()
     }
   `);
   expect(result.logs).toMatchInlineSnapshot(`
-    "debug loaded sourcemap for packages/kbn-type-summarizer/tests/__tmp__/dist_dts/files/foo.d.ts
-    debug loaded sourcemap for packages/kbn-type-summarizer/tests/__tmp__/dist_dts/files/index.d.ts
-    debug loaded sourcemap for packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts
+    "debug loaded sourcemaps for [
+      'packages/kbn-type-summarizer/tests/__tmp__/dist_dts/files/foo.d.ts',
+      'packages/kbn-type-summarizer/tests/__tmp__/dist_dts/files/index.d.ts',
+      'packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts'
+    ]
     debug Ignoring 5 global declarations for \\"Promise\\"
     debug Ignoring 4 global declarations for \\"Symbol\\"
     debug Ignoring 2 global declarations for \\"Component\\"

diff --git a/packages/kbn-type-summarizer/tests/integration_tests/type_alias.test.ts b/packages/kbn-type-summarizer/tests/integration_tests/type_alias.test.ts
@@ -36,7 +36,7 @@ it('prints basic type alias', async () => {
     }
   `);
   expect(output.logs).toMatchInlineSnapshot(`
-    "debug loaded sourcemap for packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts
+    "debug loaded sourcemaps for [ 'packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts' ]
     "
   `);
 });
diff --git a/packages/kbn-type-summarizer/tests/integration_tests/variables.test.ts b/packages/kbn-type-summarizer/tests/integration_tests/variables.test.ts
@@ -62,7 +62,7 @@ it('prints basic variable exports with sourcemaps', async () => {
     }
   `);
   expect(output.logs).toMatchInlineSnapshot(`
-    "debug loaded sourcemap for packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts
+    "debug loaded sourcemaps for [ 'packages/kbn-type-summarizer/tests/__tmp__/dist_dts/index.d.ts' ]
     "
   `);
 });
diff --git a/src/core/server/elasticsearch/client/types.ts b/src/core/server/elasticsearch/client/types.ts
@@ -15,7 +15,7 @@ import type { Client } from '@elastic/elasticsearch';
  */
 export type ElasticsearchClient = Omit<
   Client,
-  'connectionPool' | 'serializer' | 'extend' | 'child' | 'close' | 'diagnostic'
+  'connectionPool' | 'serializer' | 'extend' | 'close' | 'diagnostic'
 >;
 
 /**

diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
@@ -886,7 +886,7 @@ export { EcsEventOutcome }
 export { EcsEventType }
 
 // @public
-export type ElasticsearchClient = Omit<Client, 'connectionPool' | 'serializer' | 'extend' | 'child' | 'close' | 'diagnostic'>;
+export type ElasticsearchClient = Omit<Client, 'connectionPool' | 'serializer' | 'extend' | 'close' | 'diagnostic'>;
 
 // @public
 export type ElasticsearchClientConfig = Pick<ElasticsearchConfig, 'customHeaders' | 'compression' | 'sniffOnStart' | 'sniffOnConnectionFault' | 'requestHeadersWhitelist' | 'sniffInterval' | 'hosts' | 'username' | 'password' | 'serviceAccountToken'> & {

diff --git a/src/fixtures/telemetry_collectors/imported_interface_from_export/index.ts b/src/fixtures/telemetry_collectors/imported_interface_from_export/index.ts
@@ -11,7 +11,7 @@ import { createUsageCollectionSetupMock } from '../../../plugins/usage_collectio
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
-export const myCollector = makeUsageCollector<Usage, false>({
+export const myCollector = makeUsageCollector<Usage>({
   type: 'importing_from_export_collector',
   isReady: () => true,
   fetch() {

diff --git a/src/fixtures/telemetry_collectors/stats_collector.ts b/src/fixtures/telemetry_collectors/stats_collector.ts
@@ -19,7 +19,7 @@ interface Usage {
  * We should collect them when the schema is defined.
  */
 
-export const myCollectorWithSchema = makeStatsCollector<Usage, false>({
+export const myCollectorWithSchema = makeStatsCollector<Usage>({
   type: 'my_stats_collector_with_schema',
   isReady: () => true,
   fetch() {

diff --git a/src/plugins/dashboard/tsconfig.json b/src/plugins/dashboard/tsconfig.json
@@ -24,6 +24,7 @@
     { "path": "../navigation/tsconfig.json" },
     { "path": "../saved_objects_tagging_oss/tsconfig.json" },
     { "path": "../saved_objects/tsconfig.json" },
+    { "path": "../screenshot_mode/tsconfig.json" },
     { "path": "../ui_actions/tsconfig.json" },
     { "path": "../charts/tsconfig.json" },
     { "path": "../discover/tsconfig.json" },

diff --git a/src/plugins/data/common/search/aggs/agg_types.ts b/src/plugins/data/common/search/aggs/agg_types.ts
@@ -36,6 +36,7 @@ export const getAggTypes = () => ({
     { name: METRIC_TYPES.PERCENTILES, fn: metrics.getPercentilesMetricAgg },
     { name: METRIC_TYPES.PERCENTILE_RANKS, fn: metrics.getPercentileRanksMetricAgg },
     { name: METRIC_TYPES.TOP_HITS, fn: metrics.getTopHitMetricAgg },
+    { name: METRIC_TYPES.TOP_METRICS, fn: metrics.getTopMetricsMetricAgg },
     { name: METRIC_TYPES.DERIVATIVE, fn: metrics.getDerivativeMetricAgg },
     { name: METRIC_TYPES.CUMULATIVE_SUM, fn: metrics.getCumulativeSumMetricAgg },
     { name: METRIC_TYPES.MOVING_FN, fn: metrics.getMovingAvgMetricAgg },
@@ -109,4 +110,5 @@ export const getAggTypesFunctions = () => [
   metrics.aggStdDeviation,
   metrics.aggSum,
   metrics.aggTopHit,
+  metrics.aggTopMetrics,
 ];
diff --git a/src/plugins/data/common/search/aggs/aggs_service.test.ts b/src/plugins/data/common/search/aggs/aggs_service.test.ts
@@ -95,6 +95,7 @@ describe('Aggs service', () => {
           "percentiles",
           "percentile_ranks",
           "top_hits",
+          "top_metrics",
           "derivative",
           "cumulative_sum",
           "moving_avg",
@@ -147,6 +148,7 @@ describe('Aggs service', () => {
           "percentiles",
           "percentile_ranks",
           "top_hits",
+          "top_metrics",
           "derivative",
           "cumulative_sum",
           "moving_avg",

diff --git a/src/plugins/data/common/search/aggs/metrics/index.ts b/src/plugins/data/common/search/aggs/metrics/index.ts
@@ -56,3 +56,5 @@ export * from './sum_fn';
 export * from './sum';
 export * from './top_hit_fn';
 export * from './top_hit';
+export * from './top_metrics';
+export * from './top_metrics_fn';
diff --git a/src/plugins/data/common/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts b/src/plugins/data/common/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts
@@ -15,6 +15,7 @@ import { parentPipelineAggWriter } from './parent_pipeline_agg_writer';
 
 const metricAggFilter = [
   '!top_hits',
+  '!top_metrics',
   '!percentiles',
   '!percentile_ranks',
   '!median',

diff --git a/src/plugins/data/common/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts b/src/plugins/data/common/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts
@@ -13,6 +13,7 @@ import { IMetricAggConfig, MetricAggParam } from '../metric_agg_type';
 
 const metricAggFilter: string[] = [
   '!top_hits',
+  '!top_metrics',
   '!percentiles',
   '!percentile_ranks',
   '!median',

diff --git a/src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts b/src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts
@@ -22,6 +22,7 @@ export interface MetricAggParam<TMetricAggConfig extends AggConfig>
   extends AggParamType<TMetricAggConfig> {
   filterFieldTypes?: FieldTypes;
   onlyAggregatable?: boolean;
+  scriptable?: boolean;
 }
 
 const metricType = 'metrics';

diff --git a/src/plugins/data/common/search/aggs/metrics/metric_agg_types.ts b/src/plugins/data/common/search/aggs/metrics/metric_agg_types.ts
@@ -27,6 +27,7 @@ export enum METRIC_TYPES {
   SERIAL_DIFF = 'serial_diff',
   SUM = 'sum',
   TOP_HITS = 'top_hits',
+  TOP_METRICS = 'top_metrics',
   PERCENTILES = 'percentiles',
   PERCENTILE_RANKS = 'percentile_ranks',
   STD_DEV = 'std_dev',