github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix KQL value suggestions for nested fields (#54820)

Browse source 
* Revert "Flag nested fields as non-aggregatable (#51774)"

This reverts commit c7046a08

* Filter out nested fields at the agg param level

* Forbid nested fields in TSVB

* Revert "Forbid nested fields in TSVB"

This reverts commit afcaa348

Co-authored-by: Tim Roes <mail@timroes.de>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
Matt Bargar 2020-01-18 10:25:51 -05:00 • committed by Tim Roes
parent ec31611911
commit 8ae51abe19
4 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/legacy/ui/public/agg_types/param_types/field.ts
View file

@ -115,7 +115,10 @@ export class FieldParamType extends BaseParamType {
const filteredFields = fields.filter((field: Field) => {
const { onlyAggregatable, scriptable, filterFieldTypes } = this;
if ((onlyAggregatable && !field.aggregatable) || (!scriptable && field.scripted)) {
if (
(onlyAggregatable && (!field.aggregatable || field.subType?.nested)) ||
(!scriptable && field.scripted)
) {
return false;
}

7
src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js
View file

@ -143,13 +143,6 @@ describe('index_patterns/field_capabilities/field_caps_response', () => {
expect(child).toHaveProperty('subType', { nested: { path: 'nested_object_parent' } });
});
it('returns nested sub-fields as non-aggregatable', () => {
const fields = readFieldCapsResponse(esResponse);
// Normally a keyword field would be aggregatable, but the fact that it is nested overrides that
const child = fields.find(f => f.name === 'nested_object_parent.child.keyword');
expect(child).toHaveProperty('aggregatable', false);
});
it('handles fields that are both nested and multi', () => {
const fields = readFieldCapsResponse(esResponse);
const child = fields.find(f => f.name === 'nested_object_parent.child.keyword');

8
src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
View file

@ -182,14 +182,6 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie
if (Object.keys(subType).length > 0) {
field.subType = subType;
// We don't support aggregating on nested fields, trying to do so in the UI will return
// blank results. For now we will stop showing nested fields as an option for aggregation.
// Once we add support for nested fields this condition should be removed and old index
// patterns should be migrated.
if (field.subType.nested) {
field.aggregatable = false;
}
}
}
});

4
test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js
View file

@ -72,7 +72,7 @@ export default function({ getService }) {
readFromDocValues: true,
},
{
aggregatable: false,
aggregatable: true,
esTypes: ['keyword'],
name: 'nestedField.child',
readFromDocValues: true,
@ -154,7 +154,7 @@ export default function({ getService }) {
readFromDocValues: true,
},
{
aggregatable: false,
aggregatable: true,
esTypes: ['keyword'],
name: 'nestedField.child',
readFromDocValues: true,