maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[APM] Update aggregations to support script sources (#76429)

Browse source 
* [APM] Update aggregations to support script sources

* Fix whitespace

* Fix checks

* Explicitly require field in projection

Co-authored-by: Dario Gieselaar <dario.gieselaar@elastic.co>
This commit is contained in:
Wylie Conlon 2020-09-03 12:23:29 -04:00 committed by GitHub
parent e2f283b1a4
commit 26d16dd093
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/apm/server/projections/typings.ts
View file

@ -15,7 +15,7 @@ export type Projection = Omit<APMEventESSearchRequest, 'body'> & {
body: Omit<ESSearchBody, 'aggs'> & {
aggs?: {
[key: string]: {
terms: AggregationOptionsByType['terms'];
terms: AggregationOptionsByType['terms'] & { field: string };
aggs?: AggregationInputMap;
};
};

41
x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
View file

@ -23,13 +23,13 @@ type BucketsPath = string | Record<string, string>;
type SourceOptions = string | string[];
type MetricsAggregationOptions =
type AggregationSourceOptions =
| {
field: string;
missing?: number;
missing?: unknown;
}
| {
script?: Script;
script: Script;
};
interface MetricsAggregationResponsePart {
@ -56,43 +56,39 @@ type CompositeOptionsSource = Record<
export interface AggregationOptionsByType {
terms: {
field: string;
size?: number;
missing?: string;
order?: SortOptions;
execution_hint?: 'map' | 'global_ordinals';
};
} & AggregationSourceOptions;
date_histogram: {
field: string;
format?: string;
min_doc_count?: number;
extended_bounds?: {
min: number;
max: number;
};
} & ({ calendar_interval: string } | { fixed_interval: string });
} & ({ calendar_interval: string } | { fixed_interval: string }) &
AggregationSourceOptions;
histogram: {
field: string;
interval: number;
min_doc_count?: number;
extended_bounds?: {
min?: number | string;
max?: number | string;
};
};
avg: MetricsAggregationOptions;
max: MetricsAggregationOptions;
min: MetricsAggregationOptions;
sum: MetricsAggregationOptions;
value_count: MetricsAggregationOptions;
cardinality: MetricsAggregationOptions & {
} & AggregationSourceOptions;
avg: AggregationSourceOptions;
max: AggregationSourceOptions;
min: AggregationSourceOptions;
sum: AggregationSourceOptions;
value_count: AggregationSourceOptions;
cardinality: AggregationSourceOptions & {
precision_threshold?: number;
};
percentiles: {
field: string;
percents?: number[];
hdr?: { number_of_significant_value_digits: number };
};
} & AggregationSourceOptions;
extended_stats: {
field: string;
};
@ -133,7 +129,6 @@ export interface AggregationOptionsByType {
reduce_script: Script;
};
date_range: {
field: string;
format?: string;
ranges: Array<
| { from: string | number }
@ -141,17 +136,15 @@ export interface AggregationOptionsByType {
| { from: string | number; to: string | number }
>;
keyed?: boolean;
};
} & AggregationSourceOptions;
auto_date_histogram: {
field: string;
buckets: number;
};
} & AggregationSourceOptions;
percentile_ranks: {
field: string;
values: string[];
keyed?: boolean;
hdr?: { number_of_significant_value_digits: number };
};
} & AggregationSourceOptions;
}
type AggregationType = keyof AggregationOptionsByType;