From 96d5bd32d6284df5d270e2f38049c316134e5e81 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Tue, 25 May 2021 19:40:43 +0000 Subject: [PATCH] [Build] restore esTypes Restoring the opensearchTypes to esTypes and then updated the tests (unit, integ, and func test all passing). This is allowable because this is for functional purposes and for clusters/plugins that will migrate to Dashboards. Their index will not require re-indexing for 1.0.0 and shouldn't require a full migration after further updates. Signed-off-by: Kawika Avilla --- src/fixtures/logstash_fields.js | 2 +- src/plugins/dashboard/public/types.ts | 4 +- .../field_formats/field_formats_registry.ts | 46 +++-- .../data/common/index_patterns/field.stub.ts | 14 +- .../index_pattern_field.test.ts.snap | 12 +- .../index_patterns/fields/fields.mocks.ts | 50 +++--- .../fields/index_pattern_field.test.ts | 2 +- .../fields/index_pattern_field.ts | 8 +- .../common/index_patterns/fields/types.ts | 4 +- .../index_patterns/index_pattern.stub.ts | 2 +- .../__snapshots__/index_pattern.test.ts.snap | 168 +++++++++--------- .../index_patterns/index_pattern.ts | 10 +- .../data/common/index_patterns/types.ts | 4 +- .../__fixtures__/index_pattern_response.ts | 50 +++--- .../common/osd_field_types/osd_field_type.ts | 4 +- .../osd_field_types/osd_field_types.test.ts | 10 +- .../common/osd_field_types/osd_field_types.ts | 4 +- .../osd_field_types_factory.ts | 26 +-- .../data/common/osd_field_types/types.ts | 2 +- .../common/query/timefilter/get_time.test.ts | 6 +- .../common/search/aggs/buckets/histogram.ts | 2 +- .../lib/histogram_calculate_interval.test.ts | 32 ++-- .../lib/histogram_calculate_interval.ts | 10 +- .../search/aggs/param_types/field.test.ts | 4 +- src/plugins/data/public/public.api.md | 6 +- .../public/ui/search_bar/search_bar.test.tsx | 2 +- .../fetcher/index_patterns_fetcher.ts | 2 +- .../field_caps_response.test.js | 8 +- .../field_capabilities/field_caps_response.ts | 4 +- .../data/server/plugins_data_server.api.md | 4 +- .../index_pattern_migrations.test.ts | 4 +- src/plugins/data/server/server.api.md | 4 +- .../sidebar/discover_field.test.tsx | 4 +- .../sidebar/discover_field_details.test.tsx | 6 +- .../sidebar/lib/field_filter.test.ts | 4 +- .../sidebar/lib/group_fields.test.ts | 18 +- .../data_sets/ecommerce/saved_objects.ts | 2 +- .../data_sets/flights/saved_objects.ts | 2 +- .../data_sets/logs/saved_objects.ts | 2 +- .../components/field_editor/field_editor.tsx | 2 +- .../splits/__snapshots__/terms.test.js.snap | 4 +- .../components/splits/terms.test.js | 2 +- .../fields_for_time_pattern_route/pattern.js | 14 +- .../fields_for_wildcard_route/conflicts.js | 8 +- .../fields_for_wildcard_route/response.js | 24 +-- .../management/exports/_import_too_big.ndjson | 2 +- .../date_nanos_mixed/data.json | 2 +- .../data.json.gz | Bin 17920 -> 17916 bytes .../opensearch_archiver/visualize/data.json | 2 +- 49 files changed, 301 insertions(+), 307 deletions(-) diff --git a/src/fixtures/logstash_fields.js b/src/fixtures/logstash_fields.js index 57fffe4e4362..94c5fbc8f125 100644 --- a/src/fixtures/logstash_fields.js +++ b/src/fixtures/logstash_fields.js @@ -95,7 +95,7 @@ function stubbedLogstashFields() { return { name, type, - opensearchTypes: [opensearchType], + esTypes: [opensearchType], readFromDocValues: shouldReadFieldFromDocValues(aggregatable, opensearchType), aggregatable, searchable, diff --git a/src/plugins/dashboard/public/types.ts b/src/plugins/dashboard/public/types.ts index 0828586e884d..77f9d593d162 100644 --- a/src/plugins/dashboard/public/types.ts +++ b/src/plugins/dashboard/public/types.ts @@ -73,9 +73,9 @@ interface FieldSubType { export interface Field { name: string; type: string; - // opensearchTypes might be undefined on old index patterns that have not been refreshed since we added + // esTypes might be undefined on old index patterns that have not been refreshed since we added // this prop. It is also undefined on scripted fields. - opensearchTypes?: string[]; + esTypes?: string[]; aggregatable: boolean; filterable: boolean; searchable: boolean; diff --git a/src/plugins/data/common/field_formats/field_formats_registry.ts b/src/plugins/data/common/field_formats/field_formats_registry.ts index 5270c3e5e4ac..5260d9b1e21e 100644 --- a/src/plugins/data/common/field_formats/field_formats_registry.ts +++ b/src/plugins/data/common/field_formats/field_formats_registry.ts @@ -76,14 +76,14 @@ export class FieldFormatsRegistry { * using the format:defaultTypeMap config map * * @param {OSD_FIELD_TYPES} fieldType - the field type - * @param {OPENSEARCH_FIELD_TYPES[]} opensearchTypes - Array of OpenSearch data types + * @param {OPENSEARCH_FIELD_TYPES[]} esTypes - Array of OpenSearch data types * @return {FieldType} */ getDefaultConfig = ( fieldType: OSD_FIELD_TYPES, - opensearchTypes?: OPENSEARCH_FIELD_TYPES[] + esTypes?: OPENSEARCH_FIELD_TYPES[] ): FieldFormatConfig => { - const type = this.getDefaultTypeName(fieldType, opensearchTypes); + const type = this.getDefaultTypeName(fieldType, esTypes); return ( (this.defaultMap && this.defaultMap[type]) || { id: FIELD_FORMAT_IDS.STRING, params: {} } @@ -120,14 +120,14 @@ export class FieldFormatsRegistry { * used by the field editor * * @param {OSD_FIELD_TYPES} fieldType - * @param {OPENSEARCH_FIELD_TYPES[]} opensearchTypes - Array of OpenSearch data types + * @param {OPENSEARCH_FIELD_TYPES[]} esTypes - Array of OpenSearch data types * @return {FieldFormatInstanceType | undefined} */ getDefaultType = ( fieldType: OSD_FIELD_TYPES, - opensearchTypes?: OPENSEARCH_FIELD_TYPES[] + esTypes?: OPENSEARCH_FIELD_TYPES[] ): FieldFormatInstanceType | undefined => { - const config = this.getDefaultConfig(fieldType, opensearchTypes); + const config = this.getDefaultConfig(fieldType, esTypes); return this.getType(config.id); }; @@ -136,19 +136,17 @@ export class FieldFormatsRegistry { * Get the name of the default type for OpenSearch types like date_nanos * using the format:defaultTypeMap config map * - * @param {OPENSEARCH_FIELD_TYPES[]} opensearchTypes - Array of OpenSearch data types + * @param {OPENSEARCH_FIELD_TYPES[]} esTypes - Array of OpenSearch data types * @return {OPENSEARCH_FIELD_TYPES | undefined} */ getTypeNameByOpenSearchTypes = ( - opensearchTypes: OPENSEARCH_FIELD_TYPES[] | undefined + esTypes: OPENSEARCH_FIELD_TYPES[] | undefined ): OPENSEARCH_FIELD_TYPES | undefined => { - if (!Array.isArray(opensearchTypes)) { + if (!Array.isArray(esTypes)) { return undefined; } - return opensearchTypes.find( - (type) => this.defaultMap[type] && this.defaultMap[type].opensearch - ); + return esTypes.find((type) => this.defaultMap[type] && this.defaultMap[type].opensearch); }; /** @@ -156,14 +154,14 @@ export class FieldFormatsRegistry { * a field type, using the format:defaultTypeMap. * * @param {OSD_FIELD_TYPES} fieldType - * @param {OPENSEARCH_FIELD_TYPES[]} opensearchTypes + * @param {OPENSEARCH_FIELD_TYPES[]} esTypes * @return {OPENSEARCH_FIELD_TYPES | OSD_FIELD_TYPES} */ getDefaultTypeName = ( fieldType: OSD_FIELD_TYPES, - opensearchTypes?: OPENSEARCH_FIELD_TYPES[] + esTypes?: OPENSEARCH_FIELD_TYPES[] ): OPENSEARCH_FIELD_TYPES | OSD_FIELD_TYPES => { - const opensearchType = this.getTypeNameByOpenSearchTypes(opensearchTypes); + const opensearchType = this.getTypeNameByOpenSearchTypes(esTypes); return opensearchType || fieldType; }; @@ -195,15 +193,15 @@ export class FieldFormatsRegistry { * Get the default fieldFormat instance for a field format. * * @param {OSD_FIELD_TYPES} fieldType - * @param {OPENSEARCH_FIELD_TYPES[]} opensearchTypes + * @param {OPENSEARCH_FIELD_TYPES[]} esTypes * @return {FieldFormat} */ getDefaultInstancePlain = ( fieldType: OSD_FIELD_TYPES, - opensearchTypes?: OPENSEARCH_FIELD_TYPES[], + esTypes?: OPENSEARCH_FIELD_TYPES[], params: Record = {} ): FieldFormat => { - const conf = this.getDefaultConfig(fieldType, opensearchTypes); + const conf = this.getDefaultConfig(fieldType, esTypes); const instanceParams = { ...conf.params, ...params, @@ -215,20 +213,20 @@ export class FieldFormatsRegistry { * Returns a cache key built by the given variables for caching in memoized * Where opensearchType contains fieldType, fieldType is returned * -> OpenSearch Dashboards types have a higher priority in that case - * -> would lead to failing tests that match e.g. date format with/without opensearchTypes + * -> would lead to failing tests that match e.g. date format with/without esTypes * https://lodash.com/docs#memoize * * @param {OSD_FIELD_TYPES} fieldType - * @param {OPENSEARCH_FIELD_TYPES[]} opensearchTypes + * @param {OPENSEARCH_FIELD_TYPES[]} esTypes * @return {String} */ getDefaultInstanceCacheResolver( fieldType: OSD_FIELD_TYPES, - opensearchTypes: OPENSEARCH_FIELD_TYPES[] + esTypes: OPENSEARCH_FIELD_TYPES[] ): string { // @ts-ignore - return Array.isArray(opensearchTypes) && opensearchTypes.indexOf(fieldType) === -1 - ? [fieldType, ...opensearchTypes].join('-') + return Array.isArray(esTypes) && esTypes.indexOf(fieldType) === -1 + ? [fieldType, ...esTypes].join('-') : fieldType; } @@ -254,7 +252,7 @@ export class FieldFormatsRegistry { * It's a memoized function that builds and reads a cache * * @param {OSD_FIELD_TYPES} fieldType - * @param {OPENSEARCH_FIELD_TYPES[]} opensearchTypes + * @param {OPENSEARCH_FIELD_TYPES[]} esTypes * @return {FieldFormat} */ getDefaultInstance = memoize(this.getDefaultInstancePlain, this.getDefaultInstanceCacheResolver); diff --git a/src/plugins/data/common/index_patterns/field.stub.ts b/src/plugins/data/common/index_patterns/field.stub.ts index d323a995a63a..99e346ea49a3 100644 --- a/src/plugins/data/common/index_patterns/field.stub.ts +++ b/src/plugins/data/common/index_patterns/field.stub.ts @@ -35,7 +35,7 @@ import { IFieldType } from '.'; export const stubFields: IFieldType[] = [ { name: 'machine.os', - opensearchTypes: ['text'], + esTypes: ['text'], type: 'string', aggregatable: false, searchable: false, @@ -44,7 +44,7 @@ export const stubFields: IFieldType[] = [ { name: 'machine.os.raw', type: 'string', - opensearchTypes: ['keyword'], + esTypes: ['keyword'], aggregatable: true, searchable: true, filterable: true, @@ -52,7 +52,7 @@ export const stubFields: IFieldType[] = [ { name: 'not.filterable', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], aggregatable: true, searchable: false, filterable: false, @@ -60,7 +60,7 @@ export const stubFields: IFieldType[] = [ { name: 'bytes', type: 'number', - opensearchTypes: ['long'], + esTypes: ['long'], aggregatable: true, searchable: true, filterable: true, @@ -68,7 +68,7 @@ export const stubFields: IFieldType[] = [ { name: '@timestamp', type: 'date', - opensearchTypes: ['date'], + esTypes: ['date'], aggregatable: true, searchable: true, filterable: true, @@ -76,7 +76,7 @@ export const stubFields: IFieldType[] = [ { name: 'clientip', type: 'ip', - opensearchTypes: ['ip'], + esTypes: ['ip'], aggregatable: true, searchable: true, filterable: true, @@ -84,7 +84,7 @@ export const stubFields: IFieldType[] = [ { name: 'bool.field', type: 'boolean', - opensearchTypes: ['boolean'], + esTypes: ['boolean'], aggregatable: true, searchable: true, filterable: true, diff --git a/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap b/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap index 6e76f3803f31..4279dd320ad6 100644 --- a/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap +++ b/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap @@ -13,11 +13,11 @@ Object { ], }, "count": 1, - "lang": "lang", - "name": "name", - "opensearchTypes": Array [ + "esTypes": Array [ "text", ], + "lang": "lang", + "name": "name", "readFromDocValues": false, "script": "script", "scripted": true, @@ -47,6 +47,9 @@ Object { ], }, "count": 1, + "esTypes": Array [ + "text", + ], "format": Object { "id": "number", "params": Object { @@ -55,9 +58,6 @@ Object { }, "lang": "lang", "name": "name", - "opensearchTypes": Array [ - "text", - ], "readFromDocValues": false, "script": "script", "scripted": true, diff --git a/src/plugins/data/common/index_patterns/fields/fields.mocks.ts b/src/plugins/data/common/index_patterns/fields/fields.mocks.ts index eb4a903ca7a4..389dd9dcb029 100644 --- a/src/plugins/data/common/index_patterns/fields/fields.mocks.ts +++ b/src/plugins/data/common/index_patterns/fields/fields.mocks.ts @@ -35,7 +35,7 @@ export const fields: IFieldType[] = [ { name: 'bytes', type: 'number', - opensearchTypes: ['long'], + esTypes: ['long'], count: 10, scripted: false, searchable: true, @@ -45,7 +45,7 @@ export const fields: IFieldType[] = [ { name: 'ssl', type: 'boolean', - opensearchTypes: ['boolean'], + esTypes: ['boolean'], count: 20, scripted: false, searchable: true, @@ -55,7 +55,7 @@ export const fields: IFieldType[] = [ { name: '@timestamp', type: 'date', - opensearchTypes: ['date'], + esTypes: ['date'], count: 30, scripted: false, searchable: true, @@ -65,7 +65,7 @@ export const fields: IFieldType[] = [ { name: 'time', type: 'date', - opensearchTypes: ['date'], + esTypes: ['date'], count: 30, scripted: false, searchable: true, @@ -75,7 +75,7 @@ export const fields: IFieldType[] = [ { name: '@tags', type: 'string', - opensearchTypes: ['keyword'], + esTypes: ['keyword'], count: 0, scripted: false, searchable: true, @@ -85,7 +85,7 @@ export const fields: IFieldType[] = [ { name: 'utc_time', type: 'date', - opensearchTypes: ['date'], + esTypes: ['date'], count: 0, scripted: false, searchable: true, @@ -95,7 +95,7 @@ export const fields: IFieldType[] = [ { name: 'phpmemory', type: 'number', - opensearchTypes: ['integer'], + esTypes: ['integer'], count: 0, scripted: false, searchable: true, @@ -105,7 +105,7 @@ export const fields: IFieldType[] = [ { name: 'ip', type: 'ip', - opensearchTypes: ['ip'], + esTypes: ['ip'], count: 0, scripted: false, searchable: true, @@ -115,7 +115,7 @@ export const fields: IFieldType[] = [ { name: 'request_body', type: 'attachment', - opensearchTypes: ['attachment'], + esTypes: ['attachment'], count: 0, scripted: false, searchable: true, @@ -125,7 +125,7 @@ export const fields: IFieldType[] = [ { name: 'point', type: 'geo_point', - opensearchTypes: ['geo_point'], + esTypes: ['geo_point'], count: 0, scripted: false, searchable: true, @@ -135,7 +135,7 @@ export const fields: IFieldType[] = [ { name: 'area', type: 'geo_shape', - opensearchTypes: ['geo_shape'], + esTypes: ['geo_shape'], count: 0, scripted: false, searchable: true, @@ -145,7 +145,7 @@ export const fields: IFieldType[] = [ { name: 'hashed', type: 'murmur3', - opensearchTypes: ['murmur3'], + esTypes: ['murmur3'], count: 0, scripted: false, searchable: true, @@ -155,7 +155,7 @@ export const fields: IFieldType[] = [ { name: 'geo.coordinates', type: 'geo_point', - opensearchTypes: ['geo_point'], + esTypes: ['geo_point'], count: 0, scripted: false, searchable: true, @@ -165,7 +165,7 @@ export const fields: IFieldType[] = [ { name: 'extension', type: 'string', - opensearchTypes: ['keyword'], + esTypes: ['keyword'], count: 0, scripted: false, searchable: true, @@ -175,7 +175,7 @@ export const fields: IFieldType[] = [ { name: 'machine.os', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], count: 0, scripted: false, searchable: true, @@ -185,7 +185,7 @@ export const fields: IFieldType[] = [ { name: 'machine.os.raw', type: 'string', - opensearchTypes: ['keyword'], + esTypes: ['keyword'], count: 0, scripted: false, searchable: true, @@ -196,7 +196,7 @@ export const fields: IFieldType[] = [ { name: 'geo.src', type: 'string', - opensearchTypes: ['keyword'], + esTypes: ['keyword'], count: 0, scripted: false, searchable: true, @@ -206,7 +206,7 @@ export const fields: IFieldType[] = [ { name: '_id', type: 'string', - opensearchTypes: ['_id'], + esTypes: ['_id'], count: 0, scripted: false, searchable: true, @@ -216,7 +216,7 @@ export const fields: IFieldType[] = [ { name: '_type', type: 'string', - opensearchTypes: ['_type'], + esTypes: ['_type'], count: 0, scripted: false, searchable: true, @@ -226,7 +226,7 @@ export const fields: IFieldType[] = [ { name: '_source', type: '_source', - opensearchTypes: ['_source'], + esTypes: ['_source'], count: 0, scripted: false, searchable: true, @@ -236,7 +236,7 @@ export const fields: IFieldType[] = [ { name: 'non-filterable', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], count: 0, scripted: false, searchable: false, @@ -246,7 +246,7 @@ export const fields: IFieldType[] = [ { name: 'non-sortable', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], count: 0, scripted: false, searchable: false, @@ -256,7 +256,7 @@ export const fields: IFieldType[] = [ { name: 'custom_user_field', type: 'conflict', - opensearchTypes: ['long', 'text'], + esTypes: ['long', 'text'], count: 0, scripted: false, searchable: true, @@ -310,7 +310,7 @@ export const fields: IFieldType[] = [ { name: 'nestedField.child', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], count: 0, scripted: false, searchable: true, @@ -321,7 +321,7 @@ export const fields: IFieldType[] = [ { name: 'nestedField.nestedChild.doublyNestedChild', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], count: 0, scripted: false, searchable: true, diff --git a/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts b/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts index 87ec2695b122..2c710b172927 100644 --- a/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts +++ b/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts @@ -50,7 +50,7 @@ describe('Field', function () { script: 'script', lang: 'lang', count: 1, - opensearchTypes: ['text'], + esTypes: ['text'], aggregatable: true, filterable: true, searchable: true, diff --git a/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts b/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts index cb90e77b7c8e..4a2b8ca661f8 100644 --- a/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts +++ b/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts @@ -102,8 +102,8 @@ export class IndexPatternField implements IFieldType { return this.spec.type; } - public get opensearchTypes() { - return this.spec.opensearchTypes; + public get esTypes() { + return this.spec.esTypes; } public get scripted() { @@ -156,7 +156,7 @@ export class IndexPatternField implements IFieldType { name: this.name, type: this.type, - opensearchTypes: this.opensearchTypes, + esTypes: this.esTypes, scripted: this.scripted, searchable: this.searchable, aggregatable: this.aggregatable, @@ -177,7 +177,7 @@ export class IndexPatternField implements IFieldType { conflictDescriptions: this.conflictDescriptions, name: this.name, type: this.type, - opensearchTypes: this.opensearchTypes, + esTypes: this.esTypes, scripted: this.scripted, searchable: this.searchable, aggregatable: this.aggregatable, diff --git a/src/plugins/data/common/index_patterns/fields/types.ts b/src/plugins/data/common/index_patterns/fields/types.ts index b6853c632518..62c7d595eb36 100644 --- a/src/plugins/data/common/index_patterns/fields/types.ts +++ b/src/plugins/data/common/index_patterns/fields/types.ts @@ -38,9 +38,9 @@ export interface IFieldType { script?: string; lang?: string; count?: number; - // opensearchTypes might be undefined on old index patterns that have not been refreshed since we added + // esTypes might be undefined on old index patterns that have not been refreshed since we added // this prop. It is also undefined on scripted fields. - opensearchTypes?: string[]; + esTypes?: string[]; aggregatable?: boolean; filterable?: boolean; searchable?: boolean; diff --git a/src/plugins/data/common/index_patterns/index_pattern.stub.ts b/src/plugins/data/common/index_patterns/index_pattern.stub.ts index 9db5d57bd827..74b7a3d7755c 100644 --- a/src/plugins/data/common/index_patterns/index_pattern.stub.ts +++ b/src/plugins/data/common/index_patterns/index_pattern.stub.ts @@ -47,7 +47,7 @@ export const stubIndexPatternWithFields: IIndexPattern = { { name: 'response', type: 'number', - opensearchTypes: ['integer'], + esTypes: ['integer'], aggregatable: true, filterable: true, searchable: true, diff --git a/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap b/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap index 89f09eb9e3e5..ed84aceb60e5 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap +++ b/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap @@ -7,6 +7,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "keyword", + ], "format": Object { "id": "number", "params": Object { @@ -15,9 +18,6 @@ Object { }, "lang": undefined, "name": "@tags", - "opensearchTypes": Array [ - "keyword", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -29,6 +29,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 30, + "esTypes": Array [ + "date", + ], "format": Object { "id": "number", "params": Object { @@ -37,9 +40,6 @@ Object { }, "lang": undefined, "name": "@timestamp", - "opensearchTypes": Array [ - "date", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -51,6 +51,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "_id", + ], "format": Object { "id": "number", "params": Object { @@ -59,9 +62,6 @@ Object { }, "lang": undefined, "name": "_id", - "opensearchTypes": Array [ - "_id", - ], "readFromDocValues": false, "script": undefined, "scripted": false, @@ -73,6 +73,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "_source", + ], "format": Object { "id": "number", "params": Object { @@ -81,9 +84,6 @@ Object { }, "lang": undefined, "name": "_source", - "opensearchTypes": Array [ - "_source", - ], "readFromDocValues": false, "script": undefined, "scripted": false, @@ -95,6 +95,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "_type", + ], "format": Object { "id": "number", "params": Object { @@ -103,9 +106,6 @@ Object { }, "lang": undefined, "name": "_type", - "opensearchTypes": Array [ - "_type", - ], "readFromDocValues": false, "script": undefined, "scripted": false, @@ -117,6 +117,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "geo_shape", + ], "format": Object { "id": "number", "params": Object { @@ -125,9 +128,6 @@ Object { }, "lang": undefined, "name": "area", - "opensearchTypes": Array [ - "geo_shape", - ], "readFromDocValues": false, "script": undefined, "scripted": false, @@ -139,6 +139,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 10, + "esTypes": Array [ + "long", + ], "format": Object { "id": "number", "params": Object { @@ -147,9 +150,6 @@ Object { }, "lang": undefined, "name": "bytes", - "opensearchTypes": Array [ - "long", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -161,6 +161,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "conflict", + ], "format": Object { "id": "number", "params": Object { @@ -169,9 +172,6 @@ Object { }, "lang": undefined, "name": "custom_user_field", - "opensearchTypes": Array [ - "conflict", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -183,6 +183,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "text", + ], "format": Object { "id": "number", "params": Object { @@ -191,9 +194,6 @@ Object { }, "lang": undefined, "name": "extension", - "opensearchTypes": Array [ - "text", - ], "readFromDocValues": false, "script": undefined, "scripted": false, @@ -205,6 +205,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "keyword", + ], "format": Object { "id": "number", "params": Object { @@ -213,9 +216,6 @@ Object { }, "lang": undefined, "name": "extension.keyword", - "opensearchTypes": Array [ - "keyword", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -231,6 +231,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "geo_point", + ], "format": Object { "id": "number", "params": Object { @@ -239,9 +242,6 @@ Object { }, "lang": undefined, "name": "geo.coordinates", - "opensearchTypes": Array [ - "geo_point", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -253,6 +253,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "keyword", + ], "format": Object { "id": "number", "params": Object { @@ -261,9 +264,6 @@ Object { }, "lang": undefined, "name": "geo.src", - "opensearchTypes": Array [ - "keyword", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -275,6 +275,9 @@ Object { "aggregatable": false, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "murmur3", + ], "format": Object { "id": "number", "params": Object { @@ -283,9 +286,6 @@ Object { }, "lang": undefined, "name": "hashed", - "opensearchTypes": Array [ - "murmur3", - ], "readFromDocValues": false, "script": undefined, "scripted": false, @@ -297,6 +297,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "ip", + ], "format": Object { "id": "number", "params": Object { @@ -305,9 +308,6 @@ Object { }, "lang": undefined, "name": "ip", - "opensearchTypes": Array [ - "ip", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -319,6 +319,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "text", + ], "format": Object { "id": "number", "params": Object { @@ -327,9 +330,6 @@ Object { }, "lang": undefined, "name": "machine.os", - "opensearchTypes": Array [ - "text", - ], "readFromDocValues": false, "script": undefined, "scripted": false, @@ -341,6 +341,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "keyword", + ], "format": Object { "id": "number", "params": Object { @@ -349,9 +352,6 @@ Object { }, "lang": undefined, "name": "machine.os.raw", - "opensearchTypes": Array [ - "keyword", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -367,6 +367,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "text", + ], "format": Object { "id": "number", "params": Object { @@ -375,9 +378,6 @@ Object { }, "lang": undefined, "name": "non-filterable", - "opensearchTypes": Array [ - "text", - ], "readFromDocValues": false, "script": undefined, "scripted": false, @@ -389,6 +389,9 @@ Object { "aggregatable": false, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "text", + ], "format": Object { "id": "number", "params": Object { @@ -397,9 +400,6 @@ Object { }, "lang": undefined, "name": "non-sortable", - "opensearchTypes": Array [ - "text", - ], "readFromDocValues": false, "script": undefined, "scripted": false, @@ -411,6 +411,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "integer", + ], "format": Object { "id": "number", "params": Object { @@ -419,9 +422,6 @@ Object { }, "lang": undefined, "name": "phpmemory", - "opensearchTypes": Array [ - "integer", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -433,6 +433,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "geo_point", + ], "format": Object { "id": "number", "params": Object { @@ -441,9 +444,6 @@ Object { }, "lang": undefined, "name": "point", - "opensearchTypes": Array [ - "geo_point", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -455,6 +455,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "attachment", + ], "format": Object { "id": "number", "params": Object { @@ -463,9 +466,6 @@ Object { }, "lang": undefined, "name": "request_body", - "opensearchTypes": Array [ - "attachment", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -477,6 +477,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "date", + ], "format": Object { "id": "number", "params": Object { @@ -485,9 +488,6 @@ Object { }, "lang": "painless", "name": "script date", - "opensearchTypes": Array [ - "date", - ], "readFromDocValues": false, "script": "1234", "scripted": true, @@ -499,6 +499,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "murmur3", + ], "format": Object { "id": "number", "params": Object { @@ -507,9 +510,6 @@ Object { }, "lang": "expression", "name": "script murmur3", - "opensearchTypes": Array [ - "murmur3", - ], "readFromDocValues": false, "script": "1234", "scripted": true, @@ -521,6 +521,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "long", + ], "format": Object { "id": "number", "params": Object { @@ -529,9 +532,6 @@ Object { }, "lang": "expression", "name": "script number", - "opensearchTypes": Array [ - "long", - ], "readFromDocValues": false, "script": "1234", "scripted": true, @@ -543,6 +543,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "text", + ], "format": Object { "id": "number", "params": Object { @@ -551,9 +554,6 @@ Object { }, "lang": "expression", "name": "script string", - "opensearchTypes": Array [ - "text", - ], "readFromDocValues": false, "script": "'i am a string'", "scripted": true, @@ -565,6 +565,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 20, + "esTypes": Array [ + "boolean", + ], "format": Object { "id": "number", "params": Object { @@ -573,9 +576,6 @@ Object { }, "lang": undefined, "name": "ssl", - "opensearchTypes": Array [ - "boolean", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -587,6 +587,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 30, + "esTypes": Array [ + "date", + ], "format": Object { "id": "number", "params": Object { @@ -595,9 +598,6 @@ Object { }, "lang": undefined, "name": "time", - "opensearchTypes": Array [ - "date", - ], "readFromDocValues": true, "script": undefined, "scripted": false, @@ -609,6 +609,9 @@ Object { "aggregatable": true, "conflictDescriptions": undefined, "count": 0, + "esTypes": Array [ + "date", + ], "format": Object { "id": "number", "params": Object { @@ -617,9 +620,6 @@ Object { }, "lang": undefined, "name": "utc_time", - "opensearchTypes": Array [ - "date", - ], "readFromDocValues": true, "script": undefined, "scripted": false, diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts index 594b65fa19cd..ce53461c1de7 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts @@ -190,7 +190,7 @@ export class IndexPattern implements IIndexPattern { return { field: dateField.name, format: - dateField.opensearchTypes && dateField.opensearchTypes.indexOf('date_nanos') !== -1 + dateField.esTypes && dateField.esTypes.indexOf('date_nanos') !== -1 ? 'strict_date_time' : 'date_time', }; @@ -314,11 +314,7 @@ export class IndexPattern implements IIndexPattern { isTimeNanosBased(): boolean { const timeField: any = this.getTimeField(); - return ( - timeField && - timeField.opensearchTypes && - timeField.opensearchTypes.indexOf('date_nanos') !== -1 - ); + return timeField && timeField.esTypes && timeField.esTypes.indexOf('date_nanos') !== -1; } getTimeField() { @@ -374,7 +370,7 @@ export class IndexPattern implements IIndexPattern { this.fieldFormatMap[field.name] || this.fieldFormats.getDefaultInstance( field.type as OSD_FIELD_TYPES, - field.opensearchTypes as OPENSEARCH_FIELD_TYPES[] + field.esTypes as OPENSEARCH_FIELD_TYPES[] ) ); } diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts index d4a68eba2018..a9f934fa8634 100644 --- a/src/plugins/data/common/index_patterns/types.ts +++ b/src/plugins/data/common/index_patterns/types.ts @@ -156,7 +156,7 @@ export interface FieldSpecExportFmt { conflictDescriptions?: FieldSpecConflictDescriptions; name: string; type: OSD_FIELD_TYPES; - opensearchTypes?: string[]; + esTypes?: string[]; scripted: boolean; searchable: boolean; aggregatable: boolean; @@ -175,7 +175,7 @@ export interface FieldSpec { name: string; type: string; - opensearchTypes?: string[]; + esTypes?: string[]; scripted?: boolean; searchable: boolean; aggregatable: boolean; diff --git a/src/plugins/data/common/opensearch_query/__fixtures__/index_pattern_response.ts b/src/plugins/data/common/opensearch_query/__fixtures__/index_pattern_response.ts index c43dd618df0b..2c5a43696322 100644 --- a/src/plugins/data/common/opensearch_query/__fixtures__/index_pattern_response.ts +++ b/src/plugins/data/common/opensearch_query/__fixtures__/index_pattern_response.ts @@ -37,7 +37,7 @@ export const indexPatternResponse = { { name: 'bytes', type: 'number', - opensearchTypes: ['long'], + esTypes: ['long'], count: 10, scripted: false, searchable: true, @@ -47,7 +47,7 @@ export const indexPatternResponse = { { name: 'ssl', type: 'boolean', - opensearchTypes: ['boolean'], + esTypes: ['boolean'], count: 20, scripted: false, searchable: true, @@ -57,7 +57,7 @@ export const indexPatternResponse = { { name: '@timestamp', type: 'date', - opensearchTypes: ['date'], + esTypes: ['date'], count: 30, scripted: false, searchable: true, @@ -67,7 +67,7 @@ export const indexPatternResponse = { { name: 'time', type: 'date', - opensearchTypes: ['date'], + esTypes: ['date'], count: 30, scripted: false, searchable: true, @@ -77,7 +77,7 @@ export const indexPatternResponse = { { name: '@tags', type: 'string', - opensearchTypes: ['keyword'], + esTypes: ['keyword'], count: 0, scripted: false, searchable: true, @@ -87,7 +87,7 @@ export const indexPatternResponse = { { name: 'utc_time', type: 'date', - opensearchTypes: ['date'], + esTypes: ['date'], count: 0, scripted: false, searchable: true, @@ -97,7 +97,7 @@ export const indexPatternResponse = { { name: 'phpmemory', type: 'number', - opensearchTypes: ['integer'], + esTypes: ['integer'], count: 0, scripted: false, searchable: true, @@ -107,7 +107,7 @@ export const indexPatternResponse = { { name: 'ip', type: 'ip', - opensearchTypes: ['ip'], + esTypes: ['ip'], count: 0, scripted: false, searchable: true, @@ -117,7 +117,7 @@ export const indexPatternResponse = { { name: 'request_body', type: 'attachment', - opensearchTypes: ['attachment'], + esTypes: ['attachment'], count: 0, scripted: false, searchable: true, @@ -127,7 +127,7 @@ export const indexPatternResponse = { { name: 'point', type: 'geo_point', - opensearchTypes: ['geo_point'], + esTypes: ['geo_point'], count: 0, scripted: false, searchable: true, @@ -137,7 +137,7 @@ export const indexPatternResponse = { { name: 'area', type: 'geo_shape', - opensearchTypes: ['geo_shape'], + esTypes: ['geo_shape'], count: 0, scripted: false, searchable: true, @@ -147,7 +147,7 @@ export const indexPatternResponse = { { name: 'hashed', type: 'murmur3', - opensearchTypes: ['murmur3'], + esTypes: ['murmur3'], count: 0, scripted: false, searchable: true, @@ -157,7 +157,7 @@ export const indexPatternResponse = { { name: 'geo.coordinates', type: 'geo_point', - opensearchTypes: ['geo_point'], + esTypes: ['geo_point'], count: 0, scripted: false, searchable: true, @@ -167,7 +167,7 @@ export const indexPatternResponse = { { name: 'extension', type: 'string', - opensearchTypes: ['keyword'], + esTypes: ['keyword'], count: 0, scripted: false, searchable: true, @@ -177,7 +177,7 @@ export const indexPatternResponse = { { name: 'machine.os', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], count: 0, scripted: false, searchable: true, @@ -187,7 +187,7 @@ export const indexPatternResponse = { { name: 'machine.os.raw', type: 'string', - opensearchTypes: ['keyword'], + esTypes: ['keyword'], count: 0, scripted: false, searchable: true, @@ -198,7 +198,7 @@ export const indexPatternResponse = { { name: 'geo.src', type: 'string', - opensearchTypes: ['keyword'], + esTypes: ['keyword'], count: 0, scripted: false, searchable: true, @@ -208,7 +208,7 @@ export const indexPatternResponse = { { name: '_id', type: 'string', - opensearchTypes: ['_id'], + esTypes: ['_id'], count: 0, scripted: false, searchable: true, @@ -218,7 +218,7 @@ export const indexPatternResponse = { { name: '_type', type: 'string', - opensearchTypes: ['_type'], + esTypes: ['_type'], count: 0, scripted: false, searchable: true, @@ -228,7 +228,7 @@ export const indexPatternResponse = { { name: '_source', type: '_source', - opensearchTypes: ['_source'], + esTypes: ['_source'], count: 0, scripted: false, searchable: true, @@ -238,7 +238,7 @@ export const indexPatternResponse = { { name: 'non-filterable', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], count: 0, scripted: false, searchable: false, @@ -248,7 +248,7 @@ export const indexPatternResponse = { { name: 'non-sortable', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], count: 0, scripted: false, searchable: false, @@ -258,7 +258,7 @@ export const indexPatternResponse = { { name: 'custom_user_field', type: 'conflict', - opensearchTypes: ['long', 'text'], + esTypes: ['long', 'text'], count: 0, scripted: false, searchable: true, @@ -312,7 +312,7 @@ export const indexPatternResponse = { { name: 'nestedField.child', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], count: 0, scripted: false, searchable: true, @@ -323,7 +323,7 @@ export const indexPatternResponse = { { name: 'nestedField.nestedChild.doublyNestedChild', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], count: 0, scripted: false, searchable: true, diff --git a/src/plugins/data/common/osd_field_types/osd_field_type.ts b/src/plugins/data/common/osd_field_types/osd_field_type.ts index bd75dbdb07ea..c22f498703c5 100644 --- a/src/plugins/data/common/osd_field_types/osd_field_type.ts +++ b/src/plugins/data/common/osd_field_types/osd_field_type.ts @@ -36,12 +36,12 @@ export class OsdFieldType { public readonly name: string; public readonly sortable: boolean; public readonly filterable: boolean; - public readonly opensearchTypes: readonly OPENSEARCH_FIELD_TYPES[]; + public readonly esTypes: readonly OPENSEARCH_FIELD_TYPES[]; constructor(options: Partial = {}) { this.name = options.name || OSD_FIELD_TYPES.UNKNOWN; this.sortable = options.sortable || false; this.filterable = options.filterable || false; - this.opensearchTypes = Object.freeze((options.opensearchTypes || []).slice()); + this.esTypes = Object.freeze((options.esTypes || []).slice()); } } diff --git a/src/plugins/data/common/osd_field_types/osd_field_types.test.ts b/src/plugins/data/common/osd_field_types/osd_field_types.test.ts index af5cd04bb7cf..f8f09d49afef 100644 --- a/src/plugins/data/common/osd_field_types/osd_field_types.test.ts +++ b/src/plugins/data/common/osd_field_types/osd_field_types.test.ts @@ -47,25 +47,25 @@ describe('utils/osd_field_types', () => { expect(osdFieldType).toHaveProperty('name', OSD_FIELD_TYPES.UNKNOWN); expect(osdFieldType).toHaveProperty('sortable', false); expect(osdFieldType).toHaveProperty('filterable', false); - expect(osdFieldType.opensearchTypes).toEqual([]); + expect(osdFieldType.esTypes).toEqual([]); }); - test('assigns name, sortable, filterable, and opensearchTypes options to itself', () => { + test('assigns name, sortable, filterable, and esTypes options to itself', () => { const name = 'name'; const sortable = true; const filterable = true; - const opensearchTypes = [ + const esTypes = [ OPENSEARCH_FIELD_TYPES.LONG, OPENSEARCH_FIELD_TYPES.BYTE, OPENSEARCH_FIELD_TYPES.DATE, ]; - const osdFieldType = new OsdFieldType({ name, sortable, filterable, opensearchTypes }); + const osdFieldType = new OsdFieldType({ name, sortable, filterable, esTypes }); expect(osdFieldType).toHaveProperty('name', name); expect(osdFieldType).toHaveProperty('sortable', sortable); expect(osdFieldType).toHaveProperty('filterable', filterable); - expect(osdFieldType.opensearchTypes).toEqual(opensearchTypes); + expect(osdFieldType.esTypes).toEqual(esTypes); }); }); diff --git a/src/plugins/data/common/osd_field_types/osd_field_types.ts b/src/plugins/data/common/osd_field_types/osd_field_types.ts index 393a16e7c9a5..f5f05b462d31 100644 --- a/src/plugins/data/common/osd_field_types/osd_field_types.ts +++ b/src/plugins/data/common/osd_field_types/osd_field_types.ts @@ -47,7 +47,7 @@ export const getOsdFieldType = (typeName: string): OsdFieldType => registeredOsdTypes.find((t) => t.name === typeName) || OsdFieldTypeUnknown; /** - * Get the opensearchTypes known by all osdFieldTypes + * Get the esTypes known by all osdFieldTypes * * @return {Array} */ @@ -64,7 +64,7 @@ export const castOpenSearchToOsdFieldTypeName = ( opensearchType: OPENSEARCH_FIELD_TYPES | string ): OSD_FIELD_TYPES => { const type = registeredOsdTypes.find((t) => - t.opensearchTypes.includes(opensearchType as OPENSEARCH_FIELD_TYPES) + t.esTypes.includes(opensearchType as OPENSEARCH_FIELD_TYPES) ); return type && type.name ? (type.name as OSD_FIELD_TYPES) : OSD_FIELD_TYPES.UNKNOWN; diff --git a/src/plugins/data/common/osd_field_types/osd_field_types_factory.ts b/src/plugins/data/common/osd_field_types/osd_field_types_factory.ts index 2ff94795f7a1..3188dd42ab38 100644 --- a/src/plugins/data/common/osd_field_types/osd_field_types_factory.ts +++ b/src/plugins/data/common/osd_field_types/osd_field_types_factory.ts @@ -42,7 +42,7 @@ export const createOsdFieldTypes = (): OsdFieldType[] => [ name: OSD_FIELD_TYPES.STRING, sortable: true, filterable: true, - opensearchTypes: [ + esTypes: [ OPENSEARCH_FIELD_TYPES.STRING, OPENSEARCH_FIELD_TYPES.TEXT, OPENSEARCH_FIELD_TYPES.KEYWORD, @@ -54,7 +54,7 @@ export const createOsdFieldTypes = (): OsdFieldType[] => [ name: OSD_FIELD_TYPES.NUMBER, sortable: true, filterable: true, - opensearchTypes: [ + esTypes: [ OPENSEARCH_FIELD_TYPES.FLOAT, OPENSEARCH_FIELD_TYPES.HALF_FLOAT, OPENSEARCH_FIELD_TYPES.SCALED_FLOAT, @@ -71,52 +71,52 @@ export const createOsdFieldTypes = (): OsdFieldType[] => [ name: OSD_FIELD_TYPES.DATE, sortable: true, filterable: true, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.DATE, OPENSEARCH_FIELD_TYPES.DATE_NANOS], + esTypes: [OPENSEARCH_FIELD_TYPES.DATE, OPENSEARCH_FIELD_TYPES.DATE_NANOS], }), new OsdFieldType({ name: OSD_FIELD_TYPES.IP, sortable: true, filterable: true, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.IP], + esTypes: [OPENSEARCH_FIELD_TYPES.IP], }), new OsdFieldType({ name: OSD_FIELD_TYPES.BOOLEAN, sortable: true, filterable: true, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.BOOLEAN], + esTypes: [OPENSEARCH_FIELD_TYPES.BOOLEAN], }), new OsdFieldType({ name: OSD_FIELD_TYPES.OBJECT, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.OBJECT], + esTypes: [OPENSEARCH_FIELD_TYPES.OBJECT], }), new OsdFieldType({ name: OSD_FIELD_TYPES.NESTED, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.NESTED], + esTypes: [OPENSEARCH_FIELD_TYPES.NESTED], }), new OsdFieldType({ name: OSD_FIELD_TYPES.GEO_POINT, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.GEO_POINT], + esTypes: [OPENSEARCH_FIELD_TYPES.GEO_POINT], }), new OsdFieldType({ name: OSD_FIELD_TYPES.GEO_SHAPE, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.GEO_SHAPE], + esTypes: [OPENSEARCH_FIELD_TYPES.GEO_SHAPE], }), new OsdFieldType({ name: OSD_FIELD_TYPES.ATTACHMENT, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.ATTACHMENT], + esTypes: [OPENSEARCH_FIELD_TYPES.ATTACHMENT], }), new OsdFieldType({ name: OSD_FIELD_TYPES.MURMUR3, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.MURMUR3], + esTypes: [OPENSEARCH_FIELD_TYPES.MURMUR3], }), new OsdFieldType({ name: OSD_FIELD_TYPES._SOURCE, - opensearchTypes: [OPENSEARCH_FIELD_TYPES._SOURCE], + esTypes: [OPENSEARCH_FIELD_TYPES._SOURCE], }), new OsdFieldType({ name: OSD_FIELD_TYPES.HISTOGRAM, filterable: true, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.HISTOGRAM], + esTypes: [OPENSEARCH_FIELD_TYPES.HISTOGRAM], }), new OsdFieldType({ name: OSD_FIELD_TYPES.CONFLICT, diff --git a/src/plugins/data/common/osd_field_types/types.ts b/src/plugins/data/common/osd_field_types/types.ts index 1e32ea1cf5ec..ab6d7e787f07 100644 --- a/src/plugins/data/common/osd_field_types/types.ts +++ b/src/plugins/data/common/osd_field_types/types.ts @@ -35,7 +35,7 @@ export interface OsdFieldTypeOptions { sortable: boolean; filterable: boolean; name: string; - opensearchTypes: OPENSEARCH_FIELD_TYPES[]; + esTypes: OPENSEARCH_FIELD_TYPES[]; } /** @public **/ diff --git a/src/plugins/data/common/query/timefilter/get_time.test.ts b/src/plugins/data/common/query/timefilter/get_time.test.ts index 1742d19fa94f..2df8c3dbcd5f 100644 --- a/src/plugins/data/common/query/timefilter/get_time.test.ts +++ b/src/plugins/data/common/query/timefilter/get_time.test.ts @@ -48,7 +48,7 @@ describe('get_time', () => { { name: 'date', type: 'date', - opensearchTypes: ['date'], + esTypes: ['date'], aggregatable: true, searchable: true, filterable: true, @@ -77,7 +77,7 @@ describe('get_time', () => { { name: 'date', type: 'date', - opensearchTypes: ['date'], + esTypes: ['date'], aggregatable: true, searchable: true, filterable: true, @@ -85,7 +85,7 @@ describe('get_time', () => { { name: 'myCustomDate', type: 'date', - opensearchTypes: ['date'], + esTypes: ['date'], aggregatable: true, searchable: true, filterable: true, diff --git a/src/plugins/data/common/search/aggs/buckets/histogram.ts b/src/plugins/data/common/search/aggs/buckets/histogram.ts index 27e10e48179a..67ee4d11b1e1 100644 --- a/src/plugins/data/common/search/aggs/buckets/histogram.ts +++ b/src/plugins/data/common/search/aggs/buckets/histogram.ts @@ -171,7 +171,7 @@ export const getHistogramBucketAgg = ({ maxBucketsUiSettings: getConfig(UI_SETTINGS.HISTOGRAM_MAX_BARS), maxBucketsUserInput: aggConfig.params.maxBars, intervalBase: aggConfig.params.intervalBase, - opensearchTypes: aggConfig.params.field?.spec?.opensearchTypes || [], + esTypes: aggConfig.params.field?.spec?.esTypes || [], }); }, }, diff --git a/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.test.ts b/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.test.ts index 7ec6465bf99d..8c3b33e81cbc 100644 --- a/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.test.ts +++ b/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.test.ts @@ -50,7 +50,7 @@ describe('calculateHistogramInterval', () => { min: 0, max: 1, }, - opensearchTypes: [], + esTypes: [], }; }); @@ -63,7 +63,7 @@ describe('calculateHistogramInterval', () => { min: 1, max: 50, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.INTEGER], + esTypes: [OPENSEARCH_FIELD_TYPES.INTEGER], }; expect(calculateHistogramInterval(p)).toEqual(1); }); @@ -77,7 +77,7 @@ describe('calculateHistogramInterval', () => { min: 521, max: 689, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.INTEGER], + esTypes: [OPENSEARCH_FIELD_TYPES.INTEGER], }; expect(calculateHistogramInterval(p)).toEqual(1); }); @@ -90,7 +90,7 @@ describe('calculateHistogramInterval', () => { min: 400, max: 790, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.INTEGER, OPENSEARCH_FIELD_TYPES.SHORT], + esTypes: [OPENSEARCH_FIELD_TYPES.INTEGER, OPENSEARCH_FIELD_TYPES.SHORT], }; expect(calculateHistogramInterval(p)).toEqual(5); }); @@ -104,7 +104,7 @@ describe('calculateHistogramInterval', () => { min: 567, max: 3456778, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.LONG], + esTypes: [OPENSEARCH_FIELD_TYPES.LONG], }; expect(calculateHistogramInterval(p)).toEqual(50000); }); @@ -117,7 +117,7 @@ describe('calculateHistogramInterval', () => { min: 0, max: 1, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.FLOAT], + esTypes: [OPENSEARCH_FIELD_TYPES.FLOAT], }; expect(calculateHistogramInterval(p)).toEqual(0.01); }); @@ -130,7 +130,7 @@ describe('calculateHistogramInterval', () => { min: 0, max: 1, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.INTEGER, OPENSEARCH_FIELD_TYPES.FLOAT], + esTypes: [OPENSEARCH_FIELD_TYPES.INTEGER, OPENSEARCH_FIELD_TYPES.FLOAT], }; expect(calculateHistogramInterval(p)).toEqual(0.01); }); @@ -143,7 +143,7 @@ describe('calculateHistogramInterval', () => { min: 150, max: 250, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.SHORT], + esTypes: [OPENSEARCH_FIELD_TYPES.SHORT], }; expect(calculateHistogramInterval(p)).toEqual(1); }); @@ -157,7 +157,7 @@ describe('calculateHistogramInterval', () => { min: 0.1, max: 0.9, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.FLOAT], + esTypes: [OPENSEARCH_FIELD_TYPES.FLOAT], }) ).toBe(0.02); }); @@ -171,7 +171,7 @@ describe('calculateHistogramInterval', () => { min: 10.45, max: 1000.05, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.FLOAT], + esTypes: [OPENSEARCH_FIELD_TYPES.FLOAT], }) ).toBe(100); }); @@ -186,7 +186,7 @@ describe('calculateHistogramInterval', () => { min: 0, max: 100, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.BYTE], + esTypes: [OPENSEARCH_FIELD_TYPES.BYTE], }) ).toEqual(1); }); @@ -199,7 +199,7 @@ describe('calculateHistogramInterval', () => { min: 1, max: 10, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.INTEGER], + esTypes: [OPENSEARCH_FIELD_TYPES.INTEGER], }) ).toEqual(1); }); @@ -213,7 +213,7 @@ describe('calculateHistogramInterval', () => { min: 45678, max: 90123, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.INTEGER], + esTypes: [OPENSEARCH_FIELD_TYPES.INTEGER], }) ).toEqual(500); }); @@ -228,7 +228,7 @@ describe('calculateHistogramInterval', () => { min: 1.245, max: 2.9, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.FLOAT], + esTypes: [OPENSEARCH_FIELD_TYPES.FLOAT], }) ).toEqual(0.02); expect( @@ -238,7 +238,7 @@ describe('calculateHistogramInterval', () => { min: 0.5, max: 2.3, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.FLOAT], + esTypes: [OPENSEARCH_FIELD_TYPES.FLOAT], }) ).toEqual(0.02); }); @@ -252,7 +252,7 @@ describe('calculateHistogramInterval', () => { min: 0.1, max: 0.9, }, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.FLOAT], + esTypes: [OPENSEARCH_FIELD_TYPES.FLOAT], }) ).toBe(0.01); }); diff --git a/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.ts b/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.ts index 2bb684faade8..e67b786a81f1 100644 --- a/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.ts +++ b/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.ts @@ -42,7 +42,7 @@ export interface CalculateHistogramIntervalParams { interval: string; maxBucketsUiSettings: number; maxBucketsUserInput?: number | ''; - opensearchTypes: OPENSEARCH_FIELD_TYPES[]; + esTypes: OPENSEARCH_FIELD_TYPES[]; intervalBase?: number; values?: IntervalValuesRange; } @@ -95,7 +95,7 @@ const calculateForGivenInterval = ( const calculateAutoInterval = ( diff: number, maxBars: number, - opensearchTypes: OPENSEARCH_FIELD_TYPES[] + esTypes: OPENSEARCH_FIELD_TYPES[] ) => { const exactInterval = diff / maxBars; @@ -104,7 +104,7 @@ const calculateAutoInterval = ( // see: https://www.opensearch.org/guide/en/elasticsearch/reference/current/number.html if ( diff < maxBars && - opensearchTypes.every((opensearchType) => + esTypes.every((opensearchType) => [ OPENSEARCH_FIELD_TYPES.INTEGER, OPENSEARCH_FIELD_TYPES.LONG, @@ -138,7 +138,7 @@ export const calculateHistogramInterval = ({ maxBucketsUserInput, intervalBase, values, - opensearchTypes, + esTypes, }: CalculateHistogramIntervalParams) => { const isAuto = isAutoInterval(interval); let calculatedInterval = isAuto ? 0 : parseFloat(interval); @@ -158,7 +158,7 @@ export const calculateHistogramInterval = ({ // Mind maxBucketsUserInput can be an empty string, hence we need to ensure it here Math.min(maxBucketsUiSettings, maxBucketsUserInput || maxBucketsUiSettings), - opensearchTypes + esTypes ) : calculateForGivenInterval(diff, calculatedInterval, maxBucketsUiSettings); } diff --git a/src/plugins/data/common/search/aggs/param_types/field.test.ts b/src/plugins/data/common/search/aggs/param_types/field.test.ts index 62de4d3788fd..ff52d4052653 100644 --- a/src/plugins/data/common/search/aggs/param_types/field.test.ts +++ b/src/plugins/data/common/search/aggs/param_types/field.test.ts @@ -43,7 +43,7 @@ describe('Field', () => { { name: 'field1', type: OSD_FIELD_TYPES.NUMBER, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.INTEGER], + esTypes: [OPENSEARCH_FIELD_TYPES.INTEGER], aggregatable: true, filterable: true, searchable: true, @@ -51,7 +51,7 @@ describe('Field', () => { { name: 'field2', type: OSD_FIELD_TYPES.STRING, - opensearchTypes: [OPENSEARCH_FIELD_TYPES.TEXT], + esTypes: [OPENSEARCH_FIELD_TYPES.TEXT], aggregatable: false, filterable: false, searchable: true, diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md index b22666494b82..741f89b434d0 100644 --- a/src/plugins/data/public/public.api.md +++ b/src/plugins/data/public/public.api.md @@ -768,7 +768,7 @@ export interface IFieldType { // (undocumented) name: string; // (undocumented) - opensearchTypes?: string[]; + esTypes?: string[]; // (undocumented) readFromDocValues?: boolean; // (undocumented) @@ -1011,7 +1011,7 @@ export class IndexPatternField implements IFieldType { // (undocumented) get name(): string; // (undocumented) - get opensearchTypes(): string[] | undefined; + get esTypes(): string[] | undefined; // (undocumented) get readFromDocValues(): boolean; get script(): string | undefined; @@ -1034,7 +1034,7 @@ export class IndexPatternField implements IFieldType { conflictDescriptions: Record | undefined; name: string; type: string; - opensearchTypes: string[] | undefined; + esTypes: string[] | undefined; scripted: boolean; searchable: boolean; aggregatable: boolean; diff --git a/src/plugins/data/public/ui/search_bar/search_bar.test.tsx b/src/plugins/data/public/ui/search_bar/search_bar.test.tsx index 23d01c4fe115..b44e7abad793 100644 --- a/src/plugins/data/public/ui/search_bar/search_bar.test.tsx +++ b/src/plugins/data/public/ui/search_bar/search_bar.test.tsx @@ -84,7 +84,7 @@ const mockIndexPattern = { { name: 'response', type: 'number', - opensearchTypes: ['integer'], + esTypes: ['integer'], aggregatable: true, filterable: true, searchable: true, diff --git a/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts index 5ed6531fd4ca..e785bdb1cc09 100644 --- a/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts +++ b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts @@ -40,7 +40,7 @@ export interface FieldDescriptor { readFromDocValues: boolean; searchable: boolean; type: string; - opensearchTypes: string[]; + esTypes: string[]; subType?: FieldSubType; } diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js index 3b281b568014..982ccf860cc3 100644 --- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js @@ -54,7 +54,7 @@ describe('index_patterns/field_capabilities/field_caps_response', () => { }); it( - 'includes only name, type, opensearchTypes, searchable, aggregatable, readFromDocValues, and maybe conflictDescriptions, ' + + 'includes only name, type, esTypes, searchable, aggregatable, readFromDocValues, and maybe conflictDescriptions, ' + 'and subType of each field', () => { const responseClone = cloneDeep(opensearchResponse); @@ -68,7 +68,7 @@ describe('index_patterns/field_capabilities/field_caps_response', () => { expect(Object.keys(fieldWithoutOptionalKeys)).toEqual([ 'name', 'type', - 'opensearchTypes', + 'esTypes', 'searchable', 'aggregatable', 'readFromDocValues', @@ -97,7 +97,7 @@ describe('index_patterns/field_capabilities/field_caps_response', () => { const fields = readFieldCapsResponse(opensearchResponse); fields.forEach((field) => { const fixtureTypes = Object.keys(opensearchResponse.fields[field.name]); - expect(field.opensearchTypes).toEqual(fixtureTypes); + expect(field.esTypes).toEqual(fixtureTypes); }); }); @@ -108,7 +108,7 @@ describe('index_patterns/field_capabilities/field_caps_response', () => { { name: 'success', type: 'conflict', - opensearchTypes: ['boolean', 'keyword'], + esTypes: ['boolean', 'keyword'], searchable: true, aggregatable: true, readFromDocValues: false, diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts index 84dfebaebea1..0af5a2f726ce 100644 --- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts @@ -139,7 +139,7 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie const field = { name: fieldName, type: 'conflict', - opensearchTypes: types, + esTypes: types, searchable: isSearchable, aggregatable: isAggregatable, readFromDocValues: false, @@ -161,7 +161,7 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie const field = { name: fieldName, type: castOpenSearchToOsdFieldTypeName(opensearchType), - opensearchTypes: types, + esTypes: types, searchable: isSearchable, aggregatable: isAggregatable, readFromDocValues: shouldReadFieldFromDocValues(isAggregatable, opensearchType), diff --git a/src/plugins/data/server/plugins_data_server.api.md b/src/plugins/data/server/plugins_data_server.api.md index a1724b190e2b..3005f9cdedb2 100644 --- a/src/plugins/data/server/plugins_data_server.api.md +++ b/src/plugins/data/server/plugins_data_server.api.md @@ -342,7 +342,7 @@ export interface IFieldType { // (undocumented) displayName?: string; // (undocumented) - opensearchTypes?: string[]; + esTypes?: string[]; // (undocumented) filterable?: boolean; // (undocumented) @@ -415,7 +415,7 @@ export interface IndexPatternFieldDescriptor { // (undocumented) aggregatable: boolean; // (undocumented) - opensearchTypes: string[]; + esTypes: string[]; // (undocumented) name: string; // (undocumented) diff --git a/src/plugins/data/server/saved_objects/index_pattern_migrations.test.ts b/src/plugins/data/server/saved_objects/index_pattern_migrations.test.ts index 52e82d354ce0..cec537667cb8 100644 --- a/src/plugins/data/server/saved_objects/index_pattern_migrations.test.ts +++ b/src/plugins/data/server/saved_objects/index_pattern_migrations.test.ts @@ -92,7 +92,7 @@ Object { attributes: { title: 'test', fields: - '[{"name":"customer_name","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_name.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":"multi","parent":"customer_name"}]', + '[{"name":"customer_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":"multi","parent":"customer_name"}]', }, }; const expected = { @@ -100,7 +100,7 @@ Object { attributes: { title: 'test', fields: - '[{"name":"customer_name","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_name.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"customer_name"}}}]', + '[{"name":"customer_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"customer_name"}}}]', }, }; diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md index f501ba25b200..2c066808b3db 100644 --- a/src/plugins/data/server/server.api.md +++ b/src/plugins/data/server/server.api.md @@ -164,7 +164,7 @@ interface FieldDescriptor { // (undocumented) name: string; // (undocumented) - opensearchTypes: string[]; + esTypes: string[]; // (undocumented) readFromDocValues: boolean; // (undocumented) @@ -333,7 +333,7 @@ export interface IFieldType { // (undocumented) name: string; // (undocumented) - opensearchTypes?: string[]; + esTypes?: string[]; // (undocumented) readFromDocValues?: boolean; // (undocumented) diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx index 11b026c1af7f..b0ba2873fae9 100644 --- a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx +++ b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx @@ -89,7 +89,7 @@ function getComponent({ { name: 'bytes', type: 'number', - opensearchTypes: ['long'], + esTypes: ['long'], count: 10, scripted: false, searchable: true, @@ -135,7 +135,7 @@ describe('discover sidebar field', function () { { name: '_source', type: '_source', - opensearchTypes: ['_source'], + esTypes: ['_source'], searchable: true, aggregatable: true, readFromDocValues: true, diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_details.test.tsx index 51ae9c0990cc..a1d0bc2cca39 100644 --- a/src/plugins/discover/public/application/components/sidebar/discover_field_details.test.tsx +++ b/src/plugins/discover/public/application/components/sidebar/discover_field_details.test.tsx @@ -65,7 +65,7 @@ describe('discover sidebar field details', function () { { name: 'bytes', type: 'number', - opensearchTypes: ['long'], + esTypes: ['long'], count: 10, scripted: false, searchable: true, @@ -83,7 +83,7 @@ describe('discover sidebar field details', function () { { name: '_id', type: 'string', - opensearchTypes: ['_id'], + esTypes: ['_id'], count: 0, scripted: false, searchable: true, @@ -101,7 +101,7 @@ describe('discover sidebar field details', function () { { name: 'test', type: 'unknown', - opensearchTypes: ['double'], + esTypes: ['double'], count: 0, scripted: false, searchable: true, diff --git a/src/plugins/discover/public/application/components/sidebar/lib/field_filter.test.ts b/src/plugins/discover/public/application/components/sidebar/lib/field_filter.test.ts index 45fe2b41dbde..5cb0da4af248 100644 --- a/src/plugins/discover/public/application/components/sidebar/lib/field_filter.test.ts +++ b/src/plugins/discover/public/application/components/sidebar/lib/field_filter.test.ts @@ -73,7 +73,7 @@ describe('field_filter', function () { { name: 'bytes', type: 'number', - opensearchTypes: ['long'], + esTypes: ['long'], count: 10, scripted: false, searchable: false, @@ -82,7 +82,7 @@ describe('field_filter', function () { { name: 'extension', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], count: 10, scripted: true, searchable: true, diff --git a/src/plugins/discover/public/application/components/sidebar/lib/group_fields.test.ts b/src/plugins/discover/public/application/components/sidebar/lib/group_fields.test.ts index 855f18e54010..793154a78c9a 100644 --- a/src/plugins/discover/public/application/components/sidebar/lib/group_fields.test.ts +++ b/src/plugins/discover/public/application/components/sidebar/lib/group_fields.test.ts @@ -39,7 +39,7 @@ describe('group_fields', function () { { name: 'category', type: 'string', - opensearchTypes: ['text'], + esTypes: ['text'], count: 1, scripted: false, searchable: true, @@ -49,7 +49,7 @@ describe('group_fields', function () { { name: 'currency', type: 'string', - opensearchTypes: ['keyword'], + esTypes: ['keyword'], count: 0, scripted: false, searchable: true, @@ -59,7 +59,7 @@ describe('group_fields', function () { { name: 'customer_birth_date', type: 'date', - opensearchTypes: ['date'], + esTypes: ['date'], count: 0, scripted: false, searchable: true, @@ -83,10 +83,10 @@ describe('group_fields', function () { Object { "aggregatable": true, "count": 1, - "name": "category", - "opensearchTypes": Array [ + "esTypes": Array [ "text", ], + "name": "category", "readFromDocValues": true, "scripted": false, "searchable": true, @@ -97,10 +97,10 @@ describe('group_fields', function () { Object { "aggregatable": true, "count": 0, - "name": "currency", - "opensearchTypes": Array [ + "esTypes": Array [ "keyword", ], + "name": "currency", "readFromDocValues": true, "scripted": false, "searchable": true, @@ -111,10 +111,10 @@ describe('group_fields', function () { Object { "aggregatable": true, "count": 0, - "name": "customer_birth_date", - "opensearchTypes": Array [ + "esTypes": Array [ "date", ], + "name": "customer_birth_date", "readFromDocValues": true, "scripted": false, "searchable": true, diff --git a/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts index d36eea5d15f6..427b36aa5857 100644 --- a/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts +++ b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts @@ -309,7 +309,7 @@ export const getSavedObjects = (): SavedObject[] => [ title: 'opensearch_dashboards_sample_data_ecommerce', timeFieldName: 'order_date', fields: - '[{"name":"_id","type":"string","opensearchTypes":["_id"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_index","type":"string","opensearchTypes":["_index"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_score","type":"number","count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_source","type":"_source","opensearchTypes":["_source"],"count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_type","type":"string","opensearchTypes":["_type"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"category","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"category.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"category"}}},{"name":"currency","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"customer_birth_date","type":"date","opensearchTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"customer_first_name","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_first_name.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"customer_first_name"}}},{"name":"customer_full_name","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_full_name.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"customer_full_name"}}},{"name":"customer_gender","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"customer_id","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"customer_last_name","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_last_name.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"customer_last_name"}}},{"name":"customer_phone","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"day_of_week","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"day_of_week_i","type":"number","opensearchTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"email","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"event.dataset","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.city_name","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.continent_name","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.country_iso_code","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.location","type":"geo_point","opensearchTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.region_name","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"manufacturer","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"manufacturer.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"manufacturer"}}},{"name":"order_date","type":"date","opensearchTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"order_id","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products._id","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"products._id.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"products._id"}}},{"name":"products.base_price","type":"number","opensearchTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.base_unit_price","type":"number","opensearchTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.category","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"products.category.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"products.category"}}},{"name":"products.created_on","type":"date","opensearchTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.discount_amount","type":"number","opensearchTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.discount_percentage","type":"number","opensearchTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.manufacturer","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"products.manufacturer.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"products.manufacturer"}}},{"name":"products.min_price","type":"number","opensearchTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.price","type":"number","opensearchTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.product_id","type":"number","opensearchTypes":["long"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.product_name","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"products.product_name.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"products.product_name"}}},{"name":"products.quantity","type":"number","opensearchTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.sku","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.tax_amount","type":"number","opensearchTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.taxful_price","type":"number","opensearchTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.taxless_price","type":"number","opensearchTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.unit_discount_amount","type":"number","opensearchTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"sku","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"taxful_total_price","type":"number","opensearchTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"taxless_total_price","type":"number","opensearchTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"total_quantity","type":"number","opensearchTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"total_unique_products","type":"number","opensearchTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"type","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"user","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true}]', + '[{"name":"_id","type":"string","esTypes":["_id"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_index","type":"string","esTypes":["_index"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_score","type":"number","count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_source","type":"_source","esTypes":["_source"],"count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_type","type":"string","esTypes":["_type"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"category","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"category.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"category"}}},{"name":"currency","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"customer_birth_date","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"customer_first_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_first_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"customer_first_name"}}},{"name":"customer_full_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_full_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"customer_full_name"}}},{"name":"customer_gender","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"customer_id","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"customer_last_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_last_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"customer_last_name"}}},{"name":"customer_phone","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"day_of_week","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"day_of_week_i","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"email","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"event.dataset","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.city_name","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.continent_name","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.country_iso_code","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.location","type":"geo_point","esTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.region_name","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"manufacturer","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"manufacturer.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"manufacturer"}}},{"name":"order_date","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"order_id","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products._id","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"products._id.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"products._id"}}},{"name":"products.base_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.base_unit_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.category","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"products.category.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"products.category"}}},{"name":"products.created_on","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.discount_amount","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.discount_percentage","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.manufacturer","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"products.manufacturer.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"products.manufacturer"}}},{"name":"products.min_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.product_id","type":"number","esTypes":["long"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.product_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"products.product_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"products.product_name"}}},{"name":"products.quantity","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.sku","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.tax_amount","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.taxful_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.taxless_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.unit_discount_amount","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"sku","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"taxful_total_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"taxless_total_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"total_quantity","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"total_unique_products","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"type","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"user","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true}]', fieldFormatMap: '{"taxful_total_price":{"id":"number","params":{"pattern":"$0,0.[00]"}}}', }, references: [], diff --git a/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts index f17e4ecf1027..b34d97e20da0 100644 --- a/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts +++ b/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts @@ -453,7 +453,7 @@ export const getSavedObjects = (): SavedObject[] => [ title: 'opensearch_dashboards_sample_data_flights', timeFieldName: 'timestamp', fields: - '[{"name":"AvgTicketPrice","type":"number","opensearchTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Cancelled","type":"boolean","opensearchTypes":["boolean"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Carrier","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Dest","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestAirportID","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestCityName","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestCountry","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestLocation","type":"geo_point","opensearchTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestRegion","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestWeather","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DistanceKilometers","type":"number","opensearchTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DistanceMiles","type":"number","opensearchTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightDelay","type":"boolean","opensearchTypes":["boolean"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightDelayMin","type":"number","opensearchTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightDelayType","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightNum","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightTimeHour","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightTimeMin","type":"number","opensearchTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Origin","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginAirportID","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginCityName","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginCountry","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginLocation","type":"geo_point","opensearchTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginRegion","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginWeather","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"_id","type":"string","opensearchTypes":["_id"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_index","type":"string","opensearchTypes":["_index"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_score","type":"number","count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_source","type":"_source","opensearchTypes":["_source"],"count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_type","type":"string","opensearchTypes":["_type"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"dayOfWeek","type":"number","opensearchTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"timestamp","type":"date","opensearchTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"hour_of_day","type":"number","count":0,"scripted":true,"script":"doc[\'timestamp\'].value.hourOfDay","lang":"painless","searchable":true,"aggregatable":true,"readFromDocValues":false}]', + '[{"name":"AvgTicketPrice","type":"number","esTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Cancelled","type":"boolean","esTypes":["boolean"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Carrier","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Dest","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestAirportID","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestCityName","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestCountry","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestLocation","type":"geo_point","esTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestRegion","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestWeather","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DistanceKilometers","type":"number","esTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DistanceMiles","type":"number","esTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightDelay","type":"boolean","esTypes":["boolean"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightDelayMin","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightDelayType","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightNum","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightTimeHour","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightTimeMin","type":"number","esTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Origin","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginAirportID","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginCityName","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginCountry","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginLocation","type":"geo_point","esTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginRegion","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginWeather","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"_id","type":"string","esTypes":["_id"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_index","type":"string","esTypes":["_index"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_score","type":"number","count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_source","type":"_source","esTypes":["_source"],"count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_type","type":"string","esTypes":["_type"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"dayOfWeek","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"timestamp","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"hour_of_day","type":"number","count":0,"scripted":true,"script":"doc[\'timestamp\'].value.hourOfDay","lang":"painless","searchable":true,"aggregatable":true,"readFromDocValues":false}]', fieldFormatMap: '{"hour_of_day":{"id":"number","params":{"pattern":"00"}},"AvgTicketPrice":{"id":"number","params":{"pattern":"$0,0.[00]"}}}', }, diff --git a/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts index 9a21941bb317..49ea6ecae8bb 100644 --- a/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts +++ b/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts @@ -284,7 +284,7 @@ export const getSavedObjects = (): SavedObject[] => [ title: 'opensearch_dashboards_sample_data_logs', timeFieldName: 'timestamp', fields: - '[{"name":"@timestamp","type":"date","opensearchTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"_id","type":"string","opensearchTypes":["_id"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_index","type":"string","opensearchTypes":["_index"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_score","type":"number","count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_source","type":"_source","opensearchTypes":["_source"],"count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_type","type":"string","opensearchTypes":["_type"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"agent","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"agent.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "agent"}}},{"name":"bytes","type":"number","opensearchTypes":["long"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"clientip","type":"ip","opensearchTypes":["ip"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"event.dataset","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"extension","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"extension.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "extension"}}},{"name":"geo.coordinates","type":"geo_point","opensearchTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geo.dest","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geo.src","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geo.srcdest","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"host","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"host.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "host"}}},{"name":"index","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"index.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "index"}}},{"name":"ip","type":"ip","opensearchTypes":["ip"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"machine.os","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"machine.os.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "machine.os"}}},{"name":"machine.ram","type":"number","opensearchTypes":["long"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"memory","type":"number","opensearchTypes":["double"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"message","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"message.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "message"}}},{"name":"phpmemory","type":"number","opensearchTypes":["long"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"referer","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"request","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"request.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "request"}}},{"name":"response","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"response.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "response"}}},{"name":"tags","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"tags.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "tags"}}},{"name":"timestamp","type":"date","opensearchTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"url","type":"string","opensearchTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"url.keyword","type":"string","opensearchTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "url"}}},{"name":"utc_time","type":"date","opensearchTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"hour_of_day","type":"number","count":0,"scripted":true,"script":"doc[\'timestamp\'].value.getHour()","lang":"painless","searchable":true,"aggregatable":true,"readFromDocValues":false}]', + '[{"name":"@timestamp","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"_id","type":"string","esTypes":["_id"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_index","type":"string","esTypes":["_index"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_score","type":"number","count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_source","type":"_source","esTypes":["_source"],"count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_type","type":"string","esTypes":["_type"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"agent","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"agent.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "agent"}}},{"name":"bytes","type":"number","esTypes":["long"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"clientip","type":"ip","esTypes":["ip"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"event.dataset","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"extension","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"extension.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "extension"}}},{"name":"geo.coordinates","type":"geo_point","esTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geo.dest","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geo.src","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geo.srcdest","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"host","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"host.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "host"}}},{"name":"index","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"index.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "index"}}},{"name":"ip","type":"ip","esTypes":["ip"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"machine.os","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"machine.os.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "machine.os"}}},{"name":"machine.ram","type":"number","esTypes":["long"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"memory","type":"number","esTypes":["double"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"message","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"message.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "message"}}},{"name":"phpmemory","type":"number","esTypes":["long"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"referer","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"request","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"request.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "request"}}},{"name":"response","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"response.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "response"}}},{"name":"tags","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"tags.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "tags"}}},{"name":"timestamp","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"url","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"url.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "url"}}},{"name":"utc_time","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"hour_of_day","type":"number","count":0,"scripted":true,"script":"doc[\'timestamp\'].value.getHour()","lang":"painless","searchable":true,"aggregatable":true,"readFromDocValues":false}]', fieldFormatMap: '{"hour_of_day":{}}', }, references: [], diff --git a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx index 647df61687ff..b9cfa5d82d32 100644 --- a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx +++ b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx @@ -206,7 +206,7 @@ export class FieldEditor extends PureComponentHh2nb$stzZBHWMOn+E^2dcZUF3^Yg60E(#PNLr%+L+&c0bs z&HdtcU~UfA#Rd{KTa>Vc(TS0GWIH*Wt$g>V$2MSFBUv&^9IDt&Hd#rG+N0KQ{@v3v z{^vK(+ZaAR1RHg4qZ@ZN{;&tW`u&kT@(=tE{BPK`XTzu){C~Ih;17pE64kq`tNdGu zYrLaLjgUasZs1T26T&5-i_cuZEdE<}I8xMZs-w!5d zrwxxU!T9sW_kZtj!RFUqJM4T3hNnr`3CcF}FZ>5ae_{N$ZSDK?lf4)`u!jBxKNI=) z!T1LjZwGDLC$M0p?IQ7>)im*DYRoOIV>=yos|z6~ok!{i}OhRyA_ zVQwQFJ|2$`ya{XVEtAK$VeDbt@rPj?&0E_G;_HVvjD~50XHKojU#@eGWD%Q6^ zgrH|ntk>T5*v?=5ZJQW;Ji31?rnbZTU>`*JTe7#X>#h$ACrQ{_wDMQ%)QO#MNHtCj zemlBxYVTW7juUg=n0A~P{Z`cD#M(EbAFso1F@Gb+7yfVq$E_?{Xp>MyjhtM&7CQ%> zILS^Rl`-e(;DS9*hYK4t&gacrG<$Hq>z+=O?YoMM9TpaV(@WR!jJy8h$?atjeEIdY z^$?U41X}kG^QLzFq2u9Cj;_JVxrA}KH)ndE$&txti#vb){`|Rr{~L`n=g8jU{ zhkw3reX4G=#$f~z=p+QK!c+d9%{E&zc5TMl>KL1Jezt4=s$qY8Hhu`Ai4D*dgS(s9 zPr8Ha0bJe>;K=^n?2VBv}2an^u_Ya5lKuoA3zx{juJIGbGiG zPo}%uD%@WR5vnTguTC7@hP}E*7@q$M-81?5`Tn>Wh2Y_%dpK$^R>T-8xZ>CtGJoUc z-QdVURdr4rAjoPVgE!aF& z{Pye_j4U%JQyE%I4#^Egj7lk(5}M1@<>U0Iy%JNdkQP!ZAqnF`JYPDKK7UI+)%jE) zoW`zG?WsE-$KIrwg^MPy_J-O2WLlSJi)WvbOV&zwjg%2s8U`=FW=1)#oftwe!w7nr z6QPAMnCa(BC$W>g<8IBQb?+>Z;8>|zIt zY?Mt}%tTqUT>@oXAb|xn#>Fupiy&qh#G36IFn3X=BI4XjoZ$|T;sR|<`_quE8_M^tdW92)-2Uq z`I)aGq$3OhKtwr*+i6KzcIrzrj1i|A5F({8bPbs=p?}XYVaGX$BMf098Bstvc;Ol0 znT%5!7_SUgKsjht8wcVJ!Goht=yzjp3q;m1_CAdKB>3M7(A#V_j`E;)6#O>?QD_h4 zkniYYDe@76fZeV%Sj`xO6~(3i`i?%-?A!M5eK^wdE&(JfXT(IEu*!qUt950> zIE3j$P=Bmp6lFv+S`K?3g5ef)umf;=K@|I5BZ1d5zKs)b8Hgk9Z;Hscy`4N6XB+$^vh$ky1bZEpRbAQh832cEHtdA7FXn8wIvV~J!M z+j(JD70|9maErSF__{jV&!*R;m27dgUxr=^aml4K2GvM#L)0>WHTG*)`*(ZY@RiBGY3pL9Kx=ISk|+5kY?`br$Mv${L`38{do00 zkmAd{7gU^mXLWAsqGG`K>&k)&(Bs4=CosdB8BWUarEHvdG93EfeDBEbbnRf*twCEu zXsdL@`03;_n@W?rWK(Ig43z|8lyU=F(tkDZDS@Ok1V%>3z_$RW&DzOvCY*|djZ)cJ zH>oH*DT28snY7{*GkC6`q(F&qsZvtqCkQIiJlndYB8OYV4sM{5K(j(*3!!c{$Ry#& zaLP4iLfEI_z*-}OS0Rkz>+9=1q?XviIJ8@G0?AqGvOv+RWku+{(r)+-ku+I@50j1 z+s`W!+kb@T>)-g@Ozt(yq{@gwlo3XhaB)v*#HrCju%$uevTRv_*+~U~l;s{ol3HMu z$33QOF(X81QV1#eVhL8kc>yOapMSBp*~;bK5f%qKTIX{QGiFC!8%V;Sn>{BWF@RbEhJ2ve9z%xxCmV3vt4qBzo&QX;8VoGVTp>}o+*+LZy1!Pj^Noz}WI$>mr) z=)~W0Kz4Rs3S>ecW8Wv2M==Op2`^CLdUjqrI%(yQY;jEdB`~(G44AUYZcw zZPs>Lui+O+JP1xC3?Ec#!?H^<1c=4S>rN<9jAfQ&{6Ktt_>+G8_-9_ksS(I7tR=BU z`i$!AiAn)9##|7EiO@E_=MH*p_HRc2HwqH?y#TM)D6)=IY?5;8&pe3D+$vzvA0+Q5epmk^;4%m~G- z`byU@h$6pqSb5Rh$>!Rm%}lComJ(zd5rQFZB+@0xBm&`MmmV#ZWt;7q$)sALkdiY{ zGH@%vm9SwYEo}WOr3x=ERZJa|kY|GOrPzx&};LXmPoU}_( z1tuCoc*?PK)nL5W%vMt~OX`BwS=9tvTds^!#0}_vg{k7i4X~_K*>Zlh?)<2C=ZD_u zs2i_PMs|9!mkqL~#!2(L^!kSe%!ui>mCHg*s)lo@?tV-2!Ff>#&Bxu*C6K4 zM484^fC3^As3@kiSOdvU@#WF(zRJsv5yU9yeMU44l6s%8^qDe1;A;=n~siDnWU z(=`wJzC@rh`Nr#%0M{yp+PZRSLfG^zjQrRx?-gYi1uTc!;V2wGnaQ&v8cr!D zkP8#Ceb)n zprmcwDnalm;R;6I3p=v$_R7fuRp+$wYPQbWs@dSJ<={l)2{cJ$xd63nEr(qK&;u{r ziX+F~EGf1%_J5AE**0w}6K&f&CD0~pMT^iz6Ia||-#4n50p=_t+xAZF_%ai0MYhLK zT4Q9lCNZ2y0VK!)n*nTaWybT>at%W5Q}eV%xAJB`2}XtsO0bc3%`m6gN)0}OUHEBd z-tCGrr%-F$1yQd%@>+K=s`dKeXqBY^?bH@O)hEljJZL~ zaK?!t@H?AulG+7YnA^l5MA0*~);|q#4b|Mb;(3dlpaZpL@UMoK7=D}V0uLBKY;782 zAfoMW*MD;L_w?IFk@Q=Y<+;i(P@t+})U7KK2T~46!YIV9CL|uUe3N>)1H0i*T z;Vn&oa`t6~khOeO?#@-t^y$_ph~lw`TvU*=lc;6lRsh$y&cfxALL4RQbtP*;AX)`g zt1xl;mL^EUu!S)xRuyuRw*>2zOFS8_^Qr;2uB04Q%GS~=teEDUsFEu@mjUj5PIbkV zR(}jxpJNO{WeBFT3*R`!6mg+7*Ao6p7fZ^1hN^2_YSUsld=tnpD(#1{8yw16eHWf-WTfJ!a+b}Ly z8yE0e#2Hy&h5@wN<)<9Ly>5oV?ze5rcq>NSx-xG>DqCu0Cb$7 znlNPqVI*fCHKy!t)lzF}zvDtn?c8AqOj=-BJHGeM!fr3{#^217%e0-dW`7>jZ0nU0 z4QocIa&IuCF+4*M;?lK?m4j%fsqKxbBO0k=U8faqnbuv~I#GC$C=8JBYGY=X_N}~C zq&on8FLcY|T!H~qO8Cl~T5XI_zNoX!?lzBVw0 zz6*`x`OO2{?bb2LOQabj><*Pg!$@fW$=QiCxDIh6AmWFQWRrug z=+ip;o!<*0@4z1bnjZ=Vo4K2^y|kJ`uI+y&|#{wI9Y#-Eg z-g>LoeZ!Ngb6xrB_kUnr88t2lgqtuP2pIf9b(Ea_d|xtJY{{r&^-BiJjLoFm3Jz&2 zgL9U{b8NpB3a|$Qj$B8nhx&x|$?R7HI#?zpC3XWgZMWyiuF(~CofXvvD2}DVu2MFL z0EWYU;I;iue81G6TswK}E^%k>4Q(k!41e1im}0Y?mwEB#>$fJ- zb)o8%R7|yXCD9mG2poyRXrk?Gd&x~Fms72A=O=avOgHfM{1LQQ8gPy6oN3R~|7Y*Y zy4pyR^+NMP`rY|Eeqq&@EJ7 zDB+a}JRT%$!|+^KP_+6GU>u_N)&Z5zCW3F>5wpNI2BYgyIXoL&9_8@t`|)!1S;g>8 zWOMR((Jzqd?o!E{-CXkKT0$z-=GeNr%d*C1W|q@CfHhR0JY6>{hYZJOX2%3DkJYQP zp(-$F?XUKz5g5f zNJq1BrjVV265s{B_SexesI^=0^5`1@Zta3KJoF<3H!-@|>CJRB z8UL%*zx}hdH=KQ*E?t91Q0;WDpkaD3o%sGU>Km0YUsh?PPa(Rs1VEl)ly!^je3S7P zX9nJ-{MbFplU^7f3O8@YkJE>8Aq1O~hZtvn`xk?YekTK8POv`7D5Po&v`bfJn%Zjb z0|aHA_TI+Y%fZv#!zz2r!FjgDoFBHvQp{2*?^W<7YTO<8ebQMDwj6=%q(B0xtHbnd zDeK3p#x$C9<1`4C>Elj@mB;-hjfJZE!W7q+gN%<_!4qaJ(dO!YFjb~!WvVk4EDGc! zaj|jqaIv}8lX_-?Hs|Ou@6adRhL*^l;@?+Y_H=TxwSQ`pkQp9->wJD{ZQTq%FV)h; zY&g!dUEHPE?LvCqQEmA=TcS}a9}SxgO9oR0bfc(}1MozNG<+4SL|+{R#YAXN_DejGRh zZWS#eIX23OcX8S0X3xokY2Gl{IH2i45sFg0%tuA3UKS!dblN_&H#6ePk7YOCqq zLGJ%bt`LCW%nIXCIg4zomKHtPxe8RHrV79qi>W+=Jh&l$)TCZN=wkQc_$Uu^(iqKV zR_xAce7b23mfjjV1!$%M^If)HlWe_A ziweQ9dv|buY`MYlCg~m(5WP^qKE2+(guyqP!TJ8)hkXqhKx4a2{`8O=QyXMROV)X+ z4xAZ{)XGYDK2&_BBlvxKJ6y@xdw07){(7-<|9;^5AWYL`MQ?}d>bM05IAP|lnB}l6 zD1Lo;Z0C|2I(H2O7wjLx>E^|82F?IPP$qz; z(hQV$85>9{<-llfL9+(J#R#~kbXCk_+!lY>1#^9#*yc*#a8_&=pP%urh>DnLJRh*~*RDGIacpOVwqs z>9ld~`$v06IVk~^ACBEzy`#$4qtTh5c4?V^x+Wc`LSQf$6F_zDTD{@zfF*P<;f=OzU$B<>qh_OSS#w!-)6_hTt~S9|2TXvp z(#wjRj&z4Pc;Y0f<$yIf0Z1d(U`j_x56h}@(OA10%`KZZn|7&1?fzf`AqiQfl2t%| z(k<@kgI1D0@k}(k)~u7KdYS#wq%XLNy+P%5)Y-o3Z|0nVc;W}>4bB(1I^%p6=+<@) zfR~)~bchySEy9Bn2m?4lwZ63tY_`+Y(zKE=jm*kL9FW34jw{Cz^EYIQSq$k z3__WG0DA)!5V!7q0ASnLwyc@sansa)h)lDuyW+=!588*7cbw(c0rbI7#=noQTmNVs z&_zXmbau}<1awZ$#$RsuyQkIT^R7N-YPO$0GF`P*GD)NBQL;2WY6!zqHB>xwvt>-u zdfg-xmXS?qv_e@AbZtti$ub#JmhEE|@c79Y(?l95xZ^#!m-p)SL9y3{^2{B7&Sd8) zqo{YVhC^zpsg^NT?qD|hWBf4P=np54|KFKhk4i?l4=(aqpg)dV-y)PAs+LXR5~)5A zbh$-nHp_j@L7Hz<_gOcktjR{ES1T1Fi zy1*iE=@rMSV6Y8n47NLJ2e);92F-%dS{ltk+Lo7|IgJ4eM!A9DrrP*u66iaxqqadB ze$P><+2e8C)F2HN2o~Nc$95-LLPf8%cNJ(k6=+$nG`4pYRF^nOH#F5UnX-)C{F%)r zS>F}tk(Aiq+#YDX2w`X?NV5dxG$P*g)-IdNXP5 zv<^p;$>{4U-n9oi1@``8u*KE1ZueTM>Di4q+Mz1poM%h5au(gkIrheSCXmoJvi1nP zaZ{5uO=UiHD?rzgBm#r}1O1_uMW_zw#H96o3IN{S`OnX7y{Cj}vmll|yi<%l{4k1b) z+7eAcf#d%I()yz>Pcu3NSzzlQ9q8?geg@cpnrRPU+1P5HiKmso|s?RCli{KX{fUni5RwsWK zdAL_eDm03+H>Sonus!`WII=sZ-5kn+P^c_;PPzjY zw4_mv?srXHxwmXQj4_bgziZL;H~eFGO`rG*0N35k?+&_uquKTFzUJM5<3!KMH5G)D zx=f%7ujEYz+SYdQmYiB#`@;0MrUq`-YGLWoN)J})sb{FTK3LAfeNT=`L0lEBs8NBp z7swn#)Xt~NI(jsLuv#kb`AcZRRMH-pV||rDy7`jcpjXanf@G6vR6XG~wXzb8Hzp;Z zn$We?+8sWB{*$ilQs8#9`!R=Y-;bDqwyGAn9E#1WZ6BqDNFM5?P zwpHEe)>zP|*Sr$+mY~+aBeCpSb>g*)8In8=`x=+|*);qiC zpYaCRc6!kn?Cj*kRP@17@urNSt4{IaB#CVx1AAkCgEAA*+(tCDyp_owX5QPYicUT zwuQ<|dbsi+cnzzMa;Wz=^l2-_0r4gXYcy!;lfgh5*I0Zcm|H=WxaAeY+vD2t$mQwqRlZu4>;Cc&ofVBMO$yo2J+Rxthb+yn3^B9zHKQQ;evt? zOnlNI1*d6oAZ4j-=}y6BuCBU`rJ?l$SX09`BdG_o+9+mDYFIs)r5u3$Xdw3ZT+F8b zEP-T4duM4RTkIYdkZiYG0m-Oy&{RXjy9RB4A?S!<^GhUKY#6FnXvQ$D8rZ@@+vl5t zLi4GSUX=sy=(I^(F~1mm7Rk!(6lDMS>ii;uXI{u)Is3;LHlQrHz&$f#^PH^V=&_;b zBM2(SY1?}GJX{6Nwk`{u6XqU?WfrNu%Z;u5g6~pY zR1pF{Z2ug<)CPV{&Elw-6KwCr#e_8`v1wSIPnF=mWn$6_c-G4?dSel3YgKS-#G_Rz z6sxS#d;Sco|*Kv%`s1EqyV_5zKnTojdfT1%;FNIh7q zBh_pkE^Bu9xNT~r=BWqJ&e6xJc$H997+)goczQqmI-N~ho!R3P{n8t;)cyOzb@^kp z$OYLvN<$pW2*<;WW?}K0mk@b>dD^R(G9K+yo#bdf7aT0jKVIKH9Gv!ANCGS>UTg;6 zfKQ_UsgWv9OQ&_UUe#s+?#GMIqFlg(!=0j@ zGR#{`v+zow*VGtJ@fglgKOm`Yqk`d;$8aZiqsgChC19&Nd>CcW?eeIXF=*rCjIO7% zhub8;RWfO_UI5jr5~FiC4py^FTUs9P&Q@*bXGwf3p_1pJx)YY}1>Wp1A|wIMQ$s4i z1}25NNZ7y|6mTDR;aH!4U1p$-TTNt9j3vC%vS3jDjPYh!ChH6pql9q?5nSue#t)xY z^PTJ-7Y1oBxNbj=oSVd*S3^TVd@^ZFi0F z-2zq5^q|lVEImy_MZvAHfY6Gaf~1kFCcR{( z3O~+r7SJvacRuZ%=i-u4c*}<0=&dvCW|DDib0Fqa7KhSk8Ber29j_E5o~E zOxKOT*AG(A(bMBJVq6;26b!O7+gH$k6mX##{=t0W1fHXzX56uge- z+M-yR?tb3i=&eWF;4BXTiZIHsS(#4vl*R-pjG8#0cZVADK*Ysp1JfJs*F-P6^aQDA{yT$AV(PxB`4~HlNw5m7H}r(` zSi2xJdl5$5Bl~Im%3gpANLDFGZ;gwuZYRm$43%D9dn!{Dl{abft(BHNeK;i4qt!_# z$^4Lv;3fxXWj30dho8C!2e}}BWGl3>T1u)pd7u~4ji&PRIk`mdz-#K9qn+maLNkYM zYq{lO8&vHZ&HJVXXP$0dq`uQ@stxGluQ)d=(R~i7S(s4Eu-tPYVl&lO*bNB;|qWCVOt=RJZjFV1`sVHVGQQDk2D_WI9% z!3yo=6;LaIA7mTrj~~8oOq3ZUb5fK>j(!9ipLwlH;D0xKEM9JLSvhJc&|?6py;D{t z(MM}4;;3Lk)W{^OlxOXdV0D*;qcXIKlWlvsb+(_YnCLBOi^igVqYqe9ahC)sPJf~1 zTsc;vd#7WAuJc=J1ShvKE@1?>F88_x^43eIv%Bd6ov?siXVvImYzV|Q=`o{PKq|d8 z$5m1ypY7>q@%>j3l#sUUV2@{mj*6V;)y|y>T85Qe)tV*ZYyV^>F z+uomFN3-GQ;nyU8zEz@A0B1dc0%xLucyvi3$9}7&Bm5e2JT3djpb5ZvDAcH@+rjyG z2&}WlGC#Qq=L~tVXSRDT18y8k@W`f2yFDNbm6w6a*WlP=9EH@>*rGg$=uMfuT17R!J*ku8Q5!_%}AE*&O~pex!56B@}wE{|W1cC(qJJvJu0D?N25F&O^RST$W>O@7DQ*9aAs^$=Y~p{>^JLbfv3uyzlB3osspbisg?gj%4|6tCb>XyuUg znbM+{vyw%^(|nwjNP2-$eRAm(}8&?wMo=@IUNbTT>%P()}xX+b5N??p1o@ zjzC-n2@LZxArCTW2h?MMY>$8aW{MeG&{d^wsi40v%!D1W8@3w|)u-}go;-&kgA$r^ zrSa!~3R;o9>+W;-R{&)McSL3qSTxo5lFBfvoU~p6U5wd<54AIO$}VG9ALD3N%F|iP zW^9ctojNvSRY{_eSgHYS5lQDkBx2~Wl#`4*W6j*0Tl)q?s~7wFX#0FSfoQax2GpZB z%5s_VtDx|6r3|7tVj%4o1n_KkI-Gp@bvAuqYz^;QN5fFTAAq#ov!qXK>7fZ|+pcG_ zsIgL$^e43jGO3ft|@nVN}1xLgc z%En7GVaPR+oPk#6=w3&WihZ%v`sY?1DTJf(linLfWgPu!bDLh$yU8;hWYA!JHzC zGewChak{BI0w4(Ev63mbr)D^W2Hwf z=1OYhqz%NOf4K5?u$i*F1}5-R)im+u1kIup`+vF6S<^(?gvE;IMGx*Dl*1o>I4N4a zG2&Xa1p_y@5zhLcVsm&B`u2ICZvRV_c0goo4zotiz)Q5+?)IvBy zG=JC9QGA3K&TyR&lL5ohm6j*9w%qt&c;*(K{Kam-ZK{MY(a7NST*fFvt^=7G8s4FEGjXbS=XE}T$uF#7LGH1r@zL+4Lj5=C-&Ru9)GnuTNW&qEUf zj+c_6#2{0_$LDpOE;LOIbY=qjwXu*)tlgY(S}G2pGg>IV8(h>h>@k{JEfiUSe}Cyj zBnehAj3Y8=YryfS3+yY_XP54Hpngsnz;ceSt8!R#ktD{Nl%=)vRGD&3Cs1e?+Wmgd zHqWAFoJ`9+C~k)nJiWinrYYs^$C5H+iB-R$4PU&^)vbDqTn)|gNY?|AKyPAM_ZTGc^VTU}ziq={QXujeh?m+YhnuDLlz*Cn-&IG27;S?Q+$%%Sv-h zZ^%xeyZ`x{n6dSc=Bc3x)@F# zhgHn__fsJwKOPswv)yhDJTt%~x7;I4gsOkVDE1?0)bbqEcDwDJcz;w<)xwPWl+?2n zhyq?%A9wyS0+HB(;8N4hM>N~=HU0XvJU>6ZO5xgEFblL*X0$W<<+ybL*DR2?Klk{X zpcM0v<7^R-mvt7>Org%&ZGPg?ZvFTfqS>QU@pshD`?Kh+&Z&4;(u?AY0e~VL?f@%8jq2+P_t)Nd4V(9t}U-{?j<(UGp}&2+@`Iy z!ufj67;70)D4Qofe zZXDK*3gV=h29KO6>X}FCdP*7ss}R?gDqa!Sy1gi_RdLgo;4D&juDQZ%W-%?dG=HRu zSYRFOXuFBa1~S42(!w>ovnj z0;@YR^E7hWSToFVMivHOoi;*6tP^9suy~Png#Yz-IYk8!+ep~_{PUztJW(>K@nv&1 zq(*ELTqv&rLeVs}cw*9JDpIcDy>4j>(USj#iYxi?pIOq$d)jUEWhLnw;9B2oo*ws7 z*8~r){Tr5+;9$nT&IJ~WbXU^j%MI*EdMcdJ3d%L^)daZuh0fjs?GrBd^4^slK zOTf$0BLC#1SIk91-$Qt-+nI4{>U(aGT?*1z#eZSV;x|U7hL+~_+LYEA-y&Xwi@_Eo zStvp@)|1+jf3=k0fYqSc@{o`KyIAuJ$u8d#Wj?TP-`OsJ+ONsJqe{!;g9}LL#=bu@3TAbcV+P50YeVg!C3#|M`xyF_9o8AuZ>u*bLpU2VX`?G&~dUl@4rPO%oTLavL&3~{RIRz?D zTQ*D3=)B)P-io48mCZ>?0H-`RZ>4sCcSF1tCY_l#j0HJH7}bEn^@EiCtHZ+tT5&}= z;M$P=hM}24}Q3d zY$S^e<8-`&u0;0is8`54J6w{kg zYwLFS`$~h!UN)ihW%fnSbp_==^B!W&^OM znqCynJ9l_9;0)OaWCpN{(G<^G>tcL&H~e*qPpmSQyg1_!2e79{X6xfqR9g(foO4Uf zE7E=ZN)U#(voOYT?*v)iyEufA@flt>Sf@!xLxu)a78iSV-=3$`V}Rrd@H&*50(gZ= zgzr*JseLp=j4}(;OA%_M8j9@yPrxB!_XSJ>8y|aR13_#*b?F3#XBn3-Z_gjes zOlm5{C>Xv8h5zOU4Ob!oX0$Rnuka}!f|kM)7Kz3%T7jqKRe!Sa2$f@-loEG1oECSj zpNs!Ke*5&Pn)U1E29!KhpEbv_M#U-op(z(D==*9INdc?0-k!n4nTe;*_<#; zQNp725`^`2caxTvVgG6`{>nZ)pz(C$uYf!dDDE;2UdTAHJhUE59csF~J#_8M!S?BX zDoM#RP?qD*oYED|uLK_DbEX=ioKD8QvAs zQ3}Cos`n+{fHriXkVslEqInaG*8#9uQ>`$IA1sm=<+K#SxcuHb-O2TMI$YJfdOKxd zLH@D$uHD8xENYoo3&*rEA(<<6F+lQA7o*;ovBIjQG=Ew%BRLkx*75~v^%Bbv>Nul; zFnEKES2eL}*#%JDVw-lNxlee zLT2}Uoi)}ZLrO#WV)z3(Crox^yBLoqllp!Bi|$Sw(w?3f#j}lC^_fEs1j0LR!h}GZ zC*z`JsDHLGX!``H{Xf%A^!V}VzDebb*V9f^I|cz9dUg=XIP~%;ly|*rvcuJn!%Gl) zeju`%w1V#_+Yy=fy=RTJyo{r@NH6h*=0>`j-ucT2Vt+VkZI7|QuZ=?e)T-p)kImEe zl7dlqB0yL;!O1rnufGaNblz{j%rCF+dFVAQZhr#cZvn~wMvS7PTt{WjG@3Q$n(ryoh-~o`QW8}+uq`h8sx#Uy zyMKT!4z^1!V9&rVh z1to&fP6=qdGiwUymz82&a+fHU_9IG&*4;`KVxwYlcjE=59oAU~nuh{<4&Z}}+$1%m zVR$GSFt?Q6dF7eFqp!hf%^?+JWPnlVu{TZ^VBD*MoX&Nkg<77v9ocX z9tGMlP+A!!xk8X=K#}p$!3VyV5|fdu7HB2OFHuqhElyOG!cQG*JG_{I9H9f4SHbZq znkx1yO(ifJ9!v>iMQTr1@20P7q1mQOjD(1LMckXeSMnhk)kn$FeZ)CT*oD` z+8eTX;C9}EH>Lp)JHAqC|0-R%(H@}^hD)TWhQ|f5%2Hr|kV5Y5C^ zwKu!D8;|bpizkiZWL$A$99#;_zCS%x%+(xyDzdT;YcH6;MTo|wG$V0eGH6KYU(c4!V01hqY&q&NK@pV?u{jn+oy@ zE)YpcuHfe}@L4J9rvjoTWi=kIdluX4Kk6$h%G=+|F4y1#tBA1iCFA zs4D0t7&yt1kOrek957BM048*-Ucww6tkcp&B$K>U*#C#)3-YX$!dYb|HsDcnlXcr?DciKNsaTqrCO+&r)R?ZNM7`(dju_Y&ZT zAFRQjL(oe3JjX6hP|17J8f_g}Fop^0))?Q5@uc|l>C+x-ZL-$s@Zk~96| ze>%f|UrEL?kF$9IQ=rTfOnX&r_sNvL<7~T6vID#$GaJhO(NvEPUu5Q_*TQP>i%zDw z^tJ!)?WbyLHsG|i;0!4}kbfrZWDQ7$AVwKl5=m`rypXn&iba`-x8*3P4(l60o(s~^&T9bgdNi{?noWwo=-wQ!vL4k>yP#1|RhFLlh#Z zcH^L#6F@C_3s{#WOdO47R!b~+q!kpL(SU)FJ-*sK{FA0bAAd@55&-~v9w<>puu`N% z1}CBVu@V91xx@^69p(ugC9@j|{n?oG4Fr)d(o^BB;PlEVn$@bcqXG}c2(QndTBrDk z>8Q1HcQ-B`A6tXz?0Pg@>NQ&Kx}`#de|))2T{q2?1vBRjf!oze3W~GHIhI1+)<*k7 z+_kns-li6$8h@}#VfBLFl8x`SOBy-QPBdbJCt32_g#VkS$u`Gi1Ki z2K1>k&C2Y)h0|gl(%^x19(qeb-pgDp?XKUyeEc?YC=G|BKjU%TZORl_<3&L5DT}MhY>4a5QJDLGa;o!4QxvhI>tZ?Ft=`Vvmw_N zkc^dxDu1)oe@rAO8w+_GsiH9yZq_LaHGwG={rJb)1ZszE6YcQqFL~zN+S6jDQXP3@ zXlnxZm$4-#RXe#kV`pVy~imBXI9}(?LwvFDP s7(EMYfe`~4+2ANn-^(R{?Z2ieg>REIA%c!gQ#Z|j0o(jlyeSI;05&@5Q~&?~ delta 17427 zcmV(uKHh2nd(6tY82GWMOn+E^2dcZUF3^Yjfg8*2mxHQ>a{9n>V4W z?-$@U(TUp|f7k=x{NB(W`5XQN{xj^@vtiT;{(oC}^aq0=iK-peQU0C8 z72ejQLP(%1w{WO}3E`4Za;sQp)R;H4k zNyDQ{F#fXf<9`QSu=%aq3fo_U!ATOfgQCs+3;%)9XN>={t^JsMvsZ)r*3i%JnaF<# zMjx2J9kgwq!2JE<#~|tle$u{g!C8Cb&tEp~da*zFvhf$3Z^y$3{jPU z<~zUF5A31QNB!HLZFrCj?J>XGO@gjJm_3>VerGp{AAh#v_PKrV{mH2xe@t6l^P_gq z>)Cru8+;qby}*yMEq=LREjA}fIO)z8i~EBljJnwde+{0#$4O@`25$%b!TYjyGfW=i zWKiFJUuM_B!PC*`z`L^A-ZFW5Uq&CsZGRBP(X7?oAijBw!)TCg_|zq9GW|5@rVRh5 zclSl$4}b3874yRWz>X~kVK06NU|8+Hmm%@l@of;r>t&- zQL(-Tf&^WA!Fug(jqH6dZ{^tVqv6AQGr1K$1p5#ayhpnWyY~7pa-4+Sd29d4ojkVp z9jeu_;qOncPV9bfigj%EJJqaXcAR7<#)_Epd~nX5=fg`IG|E%XS~Pvo-G$E=6z#*3j2;vgoRg2N?R{wa2_Om_{Z$@#Qe;~hC~A4bSp`4 z7bHQ{4(!ap=gHB(UQRzx#>_VNa(eh^J%6Zk;}7gb6cbays=`Q%$SM<6ArV&idVJT( zJztuSAFiL6()I{4bJx_Ji=aYq#xl7 zNp<71>F&0c?k|N1RVDXVJC5$cZdD@;&wqvP8GnAZKW>L1c=+%Ejv9;=F@_4RIDa;V zOnG@Hxbug-LH+q=OU=@)>Y)=ei*&UlC3p4J#o>RNd*8Rt&-`So`E+vLP|Z}AFaOGC zK9bovJ2;~`K~xIKiIGZSC11MXWugqO8pHhc%xF5wnsf{%HAg0S+b<@05T5qJDCocT zsmzhxVD0uP?VEFFef#UU=4}am{-m6EJ4kIS{J#P}-&VKqOU^5*y9fG=_Vl>o__Bp9#t%TP|8G)r?@bYVBl;hg5Ap|pw zpqDujS{Q?wez|lUbJ;uYCVuqwZkP-_|G{fOf2Q4NE_X8e)amB@`Ds^5HJZBk)vva9 z=1=B&mH?Vb($ih;RPZ>7$Jx*hPuPJ3!T)zw|@2Ae{#U>Jc!^<;3r8t_D^TiA~)O+Om^z8Q6cr6ANg$A2UnLX$R2qYw;zEX(ni=t&5E4Rw{7_0tt*C$)J`+k10wM-RF|8EU2IN!*rDh&r3Q|PpVrpW3E~|Dn zul~G{CWloFDMGpCj7WhQWhRqdlv1R)!9qhwXuq9HR2})?^ZgYR)zRj(H>G(tZn#9A zVWhRRi3EpBaeqV&)=TkB(Hx$&?uWpL#QV2*X!|k>qwdOh!&SzrRF{mmb)~@+gK(S^ zr8MJ`n1Z2UQNUe>zx$DQ8T!$aA9V|7zb@-n*`OP>or$^HQ31>`jyPAu?UPs|1%s?v zsJHSnU(1k=FbDt<GUoN7Rbl)}(8WPiSdKEs3^W6?dd7Eg0xkn_#KY|}GH!1tPsZ7X zzxgGpIKUgp$iHf)#1ayY(@e1Cjml6YehGYCpYCVVYurk$;u;rW_7oS3)f7**i!x^Yqi8nScIi%%nbE zz7M4MGV28;XWv^c=_ zYXEH(ju@|wFS4mLzDqWhHj7Y6AVw)SpnoM@1D_H|N<&~|bPRlRaN4XKA7#R6nXpkR zJL@JDg(pQY*CdlxoMHyg6_gYx5iV6qs{8^$Me3(p7gXeMi`c;pR1#=bh-@L$%?6ny z92riz#!LwNG#pr~h43nbQG9cAvxmGbdHE@0GRsZ*Pr3+z;N22mxIV|K|wIGUP} zomTgO|Lw`!jaQ!lpjB+D&kkK0*VdH^gRviJ1%FXtq)=0t){^QfJ|;DnD3fOk9e*{C z>a0QXDlaH9gelA<<~ECOFv~<2Q54V=jooL}(k|a|gXPd$+^?8wLsdnS)nz7+J?zZjy5A&pe1t-G3y9WM?U& z!R)%}lCo77}C{5rQFZB+@0xBm&`MmmV#YWt**v$)ws+Ath&^ zWZ+hSD`CS*#xuzV;6ug`MSrDWKwXxSJimZ!=M2|d+c<}8*p{bLpcYm{z?+>nIcb-o z3QRPF@RVces=@fEnJuSgmQ)3;va$)bwp+fvc>#r-uqGa-VeQ# zVJBXpjO^rmFB@dfjb~2_6sja6h;U}t{kVP4);$P}v174F>BVH!5Px_NjN#PQuR+Y8 zi876;00l%KP*F^2u?CWz;ETrYzRJsv5yU9yeMU44l6s6Z(dz6rwkclpf6* zf@T!i^|PD-PJ|p)Vt;9A^ctel^OiZL2irNsvnmFZFJbV1R81$!QqqlK#DR;N63rwy zrfVMbV~Id%@{Lz10j`w{wRPpvgs|yb82PbX-YbeO3Rn!a!(rI>8pA05pN$;Cg{6(@ zZ7@EaWy7rLM|SYeUJGz?S^#H6!@z2oG0KTE2|*HsNEnNS(SPX4Y2~c4naQ(dG@MdQ zASHwV$%BQQB0#!Q7E7d*kWy=|xX7B}{E0w2I^A!c@8wN!f`wW@h$)CI!=}KgOrmkD zKuO!URf6DC!WE2u6n13e?TwQKs>*5U)oksxRkOic%fX386KImiVgYK=S`NDepbK8O z6-SP}SyF7P?SCC*vu)B=Cfc@l3ZPBciWZ@bCa$=_zHd}91I$@Ow(XtD(M2ZMmf0Rd zX^oNHn#6D-1&|;IYzDBwl^M-f%QXnKtNKZkZspB>5{wKNlwc$6nqf|}l^T2nyYSP_ zyxSFLPN7!2529{o=r!+QRO|M_;VMf3TB#|_8NV9eB7X;I(`k=oCJx|n0^BiH!i62K%oN8lqMZ` zGQ6b;P|m)r5V97p%H6rnnLgbb22nf`k@E_2dJ?rr+zQ|t)mgY)QfOqi7W)Myxmqc^ zU=vh?7}xrF-2Tx&9#JorSm0aze3eDFSKd09KH!;7?t+R*bNS4&c=?+ z*0>5~>{f^x+fp3|-;R4h^fW4&^tSwdDq%Lex65H8w?@~t6?EgI|22nX1?zOB-35YZ zOtGubh%sA+WiSzrO^#jFx@V_3D4ShXTz^=r30);6qpY*G0yjkw#6y}3$t9+wv|8PI z)Cm)R)n!xLd3C!-!FT&^-Dfkb(6T8C3QS5@YQ!!~!i?aB(+Oo%gkU>bv(dY5_tnha zctZ)S5W^sN1l9_h)#Mr6Fb`jclXXe$#J?NllI(PA_uzW#GKXY@BcTNdFJY5V9DkGS z_*5%_>~{J}5L;A;UF9J)zyBB{l_MWwfXMeokNs(-{c2N;nBA||-ljyUW~&$NejCQ+ zYNG;Pi#Q{fm|*~|c5#&hxVOzP*!{L`8E?smTUX|dNM%c{45gqA6sH+e3@b41B5dD> z1K(?e9dN_Q&TmDI`tcOq>a|uj-G3&HX0mPC?H21Zg(O4(26*Dkhk%Y{c9R&r5OLsg z2ieOKmO`8u?MTA~(*)!h<=FzwNWg&75V64vBjLfV7=h*@Zt{rp;l^2Q=P<7jL?Q|j zO%tY!AdKYfqsEloty*eL?QdLYshv9vfk|^LYsC-VY1ruo-sqQka+$VsT7S=Dnr*#Q zqG8PlRqhRjG=^sgLR`9bv2qaYB(=R!c|;>stgE!-Ez>${TPF%H5`_U0UTw_m(!Q0q zigX8{ABApNoLgc)A_00*f{MdTDXuWht_xvSd15Iv4EtR2%*lm(%9%Ii*+}ct#ev?< z0UWhIE@OWr1>1$WEVa+u)PL$xhLK&z56TVv(q*ML426V7YN=oboY}#(mlU<`L>^du|4Nx3Qgb;Hc*rsa1>EmqUFq4iIAAjz?HN9Ro zB1(8=0*?m?+b}#A78I>M1Q>_ty>&q4vx(qaXT&Ve%wzSc z?Bp!73K&dp|4bXJRqHa1aDP@ic94i&a9Rq*vOb7#z^inbC4`_s2P=^J+Msy$71H)< zhMx6=Z^~Gd1YN2DnuhD|_6Ixr8PM{=1!Pk-9^$djLK?HsQRz!a%{tH!bj+QoOYi@N zKGM;woGIjHK?(4JUi<548PwV<`1&tR6)^Pry^C&?P;eZCq4K^2e1GkAHg--5sR*yc zvE|uV{at2b<1uH12YRB@ofPOf7#F+OC7b%2&df?o``N2g01G<;b^Fg7t%wR#GVakY zJWbaPgb8aUPmVt1!i49>ebiz)DiM+AdPy{+$Av&DUkLULXJf@?{Y(A&B9QjNv9Abe zMbEwhpzRh`ps(cHw=f823(kG@R%52EeC=weZ;d5+(jAPTjW(7l00X+>1~Wb0XT|yU zcyztgnzSfn-^`O*7d=jZyN6ZwmV@(bi#b1Rjis2SQr@fJP1LwM@cX2*9BerP*=d0UQdfuR z+fvq#SB+^j=f-IeEYruG3@eZOOBxGR^@S;}F9#VPwSp(iTB6O>{a~t0&&pJ1ELarC zBjaM@=;2~>tta)&1Z~dIW8R@px(zLnJ;lGTy6oxnbo-!ZlZ_c3f7|^0)Y`roeqO4j zi`j6TXUS*34xItL&1$<%ZmfA~CQXb3#H2y0C*td-CM}1s&Ee`bTYq0SX07IMZg=9n zu1cSM-*(o`sRimxELC!7cyMNAhOA);E2!5&_PJzD!-@jWc$`aFVZfoi+#Gz&#TS5O z({I8oEtR5|8q#dEf52=s4fMvTeefy@a9ebdPsYQI-RXqB7|x~-59KxnTLY8yA z_YQLZS8{~_1ZP$lkIGqOTeY<4$<9@v8Z}h_##l_{8RWqYf1xJz`e6q<7bnMgn3Kk6 zHnU=PPUF)}Yq0dz&?!JeJsm`MqQ}#x@xveEBEhjwAJfD^ZmwIKT-rcf~A+ zWmy5inkL_}t!(Y&+v}!=aa5%UOLf0?%#_rs_Gp$Wf0?vJ;>Ytu+C^Mj%%fd^wX^dI zu(nbb?MpmcOrl*$H4v2W#w(7KqUTCxBT6>|y<$6;+|apeAh_V*2zpx=CmA>c5J8y$ zno2WJ-eqhcsgwhwy#>u02p1#Z_UNjZyFjkM@z~CDJboOxMmRH6a(f$sidJQ;hceW8 z6P}gZe=OuI)7D~nfNo1&yB6xEvAG&QN0bggEsTC~1JyEH+qr9PPiJhuTouSVrx^uQ zXL>!&)Ms0#6@W|&&e)Cav)B+p$2_cR_p=2y2B0gP8enAzp)z@(UbB@OwPon|AD61j zUejsg-1m?7k8@H2DnA^%xq3&HuScUZLG98qe|1edPKCf=FeZT7ylZubw~y1O`xVe^ z`{Py)%??MOSygpc@6Nze2OZxS7y*{hy@WT~vVFl?=8u|EYayrr-=HQ8wq?QBL;1nQ@Sc54YB|R*w%0*-CYBaZO-fY^X7PSY14TL0Ql}c6t ze@VBvrw>|5`ouHQ>{_!Lq^Co)@EVW4-cKiwt-)+OT&4Wl>t{V{_huuyfj&=X(+px&r*`lVLIOqw>5htL zMQ0Go>;u>vsDQY2?*jna#yR!g`lGXZ&LN<4ayI^Q!{0rv9-nvhF;lbs{E_LZt&&L^U5}Eb=}|)%o~ohZp_?sZ zlGg1cp|Ff>N~0CZdZ24lQcaf0n6hjitANK(&X^|BK*62t%l*7pw-1WFHk4=Xe{d!{ zPZ>qMgEbsdOHH+mv2q8q(I4Z7=|+DzdHny)$@QpYl>6W!p9T8kxb-bU>7i=b6fTkK z13{Ntgl4nc*BqqzHg%tMQ#x)MlYJUZHz^yVQq5+isoD7PoyE4&M9l?yG18cTbWXrx zrmhPt0+(KKtO^F(fW}~FQ|;o8f6ky;5L!#4IY`^`(le(qV8JLi5ZqK7A58*%=XKOJ zNWy^g#u7c_kC+UW!S|(GLv70}$ z*(B?`0zHyaJdW2?OYMfu9^@!$T2TLGwN+YLtz5Bsd?p38$T97Xn{!VPe;ymC9Zqj1 zt=-nqXfhdnUB$chaJRtTUktXmn%3=JOEo>a5l1^zC7knYsaDRS`y|KSSkD9!+D6tM zfj4eyvZkrbr)~x4I+8phsW@4CkHGtN)Ms{(XB+9Bvy{-Ceu&`qmL1aoWLiswPO`wu zdyO6epn=6FT$xjOag+r&e@V{{YS_V8)}p27Z>XsmvnD7_pw8YSv97br4tZagi1zel zwhEi${2)7k`|vb=%=Ml-h3QxRf|3F-fTh3U#@wuaEt5R3Y+taBrV3SCtG29}e>-k! z-lo`hM+LflEY&5!R5XE1muv5qw)~q}B}+W>E?8bDuq~&t3Nus=f9lc#6Le8i!^|N> z2}E0>DJXFKUqD)a^yO(rryvV#{o_NubJ5QL8&EUt0W2F^&2zER$Yv!yR&4OfD0E1G z9RarE(cDk1BU(MWA4<$n?tv)0#_`5!6{)KpVma4MWC`ya;Q;> zB;$odi&s(_m^SJ*f7HBL7&kU&Lo4XXVt7_gEn406+X^J`Vx#(;0=@`-F#`BnooaRR zcaevCl|;T$d=K7+5`?+HD*=MAG!Iu(vnL1@(QspGd;{ClPlIE-+w0^|4unEw!E@3b zu%IQ4a&*6I>dL)k<6(?}+`(OouD{_Q!)yA)R{*%qUVeAbe;LiLhxaw_4jd*vsMdBk5+oHN>4pQ#r45*9`1W`R0`s%Xhn?* zyuCo?7@~GQUDnZ~353;BdCy-$6Q+{((46S24ARY)^aj0hRud$fOrz=vx2cttXuL5g z0o8=At=8V~fAODmZI=SK0cWpErr}e+hE!)KvCV1L%hP?r7PH>j zMgNR9z_#AS=3sX>C#Iqgj*2&B3|)1K7bi(<0~y#Ge;brRNp%mZn3igf_wN6`nLf2T z!||U_tF)?Hc~9_PKOxtw7LJf7?kYj8Iu912LS#-e2!XDx8q7Xw=~Yp+jjCN0|65a2 zIkqiSUed#r2f=GteUwAJzoAcCDGrD?L0F?fQ=be5(zwRrBf;DXs>Cg?7~US&PEL1w z=lk6pf35+il^c4Ef!EVPri(Vm1U=wbcRkNMjTLR(F&oHN2ea-$Hezai*!s4mXoL$2 zLNM`3hZLNq#etNiwxzoTo4LB`HkO9g4`59V+l-_h%xa^UIjLdwWR`LO_M?H==W{We z{<8#<9q*r|k!-PhSU|G9P6Z^R&OuWR5$_tbe}$kUhRrXLY_VaeUZEMov}#}r3vHio z3JT4qMtW5ayra`5amD;%@L41)w^NY)ldJQK44!!*gXQcWW7vSQ-~#u|jLmbhhNH)Z zqK_b`7^iLf>GNvsNUOjSs5DT% z?S6vYkG&l6O;JS_406IR)tSnty(f_>J$k<;C`E?&u)v^RWEjqC*)Rko^T@EF&BbGn$3PZ(c&=f8}YfV#;{5Pj!-``CM?YH2-*g`*3jDYat1+sCcm% zd;>m>0;EQ&I4zyl)p}K%1-KtCK8tbz507@Q&N3*6N@$pKkAYsQh0MAXSO87^g_7DS zL;YGM--YeZ*zI9?^Y>SQm=>m5vQ=}`AMo3`qZ$M#ggM+rxBe;Z}VzB?rd zBFivuEzQC!fnHN%IK^W)NBw}Lx{V5kS02Ni-i;=I&Xs_z&hTNBLAT4}ZpNUEk2AWS z&K_=)09VPR&3XY;uS$&0;W${$GHq#jygOU9ou4J~t%ORRhw4sPx)*q}!-$XsI8P0! z02`PT>LOtSZ&1K}+=CN+e|DLHHf}YMMKPA}O3Q*l`7_3wWtprqRE!eFAw+PkGaEmA zUd?y1b5ar4vu%a7JGI?4 z#&-);J=23iJFxUL4HX3o@4k~|eJ4w-6_BZF)R6|`nca^eEiR?kQv*UPb_$Y4uA20c zl`8x=%UM9XJlg%Vf1Zm=M&T_RextX}u$xK7vCV;)Q&}8Jqh&nNsyALK(5iPJ3oO_d z)|2CGpjB1ou3|4&pNe%Crf|L8M`Z&NkHB_%UOKK8FOzjY!2 zhqNqTaT0oMrseNth_@O8)n7c+)SL^RR=+cN8FZfKO4JC)HJ`7GUT5-fckf~=gI=tj z(h?0rKfOq0(xn%xr|20V34KRzJh!8U)inj{%BDEJ0NT3dD3-gXCS#8C*u0d+NKX$5U$Kp>IvG2g{#KhfN||B}pi?0fFwO;B`FL7RAzZ_w)WncRkt$XL$%vgi(gg%5=J?G$u%444q0s z0Stvs?F~R}up2sq54nG=DJmM3w2nJTXHAB4O9(E!rY9@m0lhJdIqJTLyZ`muHO|Mh zY3rI5Q}<2H$Jk*^f>mg}p(mur+6AH6i!kCI*-ztF_5xf$vPwaEYg~MFJ4ps-sPyvM zQ<->qsdII_Uyp*RBP=1qm+{}MEeISaJjkQM7R<~+u$+@a;3JKbYBYqo+zQB zz9k(NN@W^%$V`7IQB>v>EY9AdXbT^X++KF8X?S5wSgeDkvdx*aUv7{=NXwBy&Tb2B7l`<>2ZtA8{8WBA)DB(=_Io@M)VpO+dORFi-Ly{~i>mE%2$^TEaR#cx`_ zy%NARmJy0ZXz7&!588+N0$l!vBG0lWxiX1XQJ8sMbn1VY-dXn`S9~oV{Vy<*5%5W! z_XxtgIP*n>Sv>bek$K_U>p%YmE3}taK&=FRkZr6#e)zsIQD%_LNl_X(`Vnk==Cvw; z|K0Ghc)7)8<*21Vj{&6iPFa;iAFZi~qk;)hBa^IBp0!JY)m;{j%FrfGckJc%*+H&i zqPL_i8jF99K44A7T@s`?{e_xyzb1e2trDFAIO_=%I1>%Tqe~Jw_FF9- z;n$GkY1uypO#seAp+-I34$j9zV4XFV`N>T#Tcas>=PkjX_weL-spZxqEDH{p$!&=p{gjT zV64N8Ikw{HO@m5%BdM)wK&H0i^p*`|=oiHwh_;fur0$W~4xB95Ep^C3=$aTWkMcg&<;prfozX|{bq_8Td1o_-BLk+UziCyVmE9z zAgWL0$vk<^a-VKtWrz!g3`%IumBxRcD`-XbuDj3SUjdX6+!C2d;H0j;msEyX<)rlr z=wi$+e5jnMQ*;@-{uoEILY~e>He(xP=~S^9D@ziM#8M4ti%2>TA`wG}rJQ8k8EfX| z+}hV5TD?5b$L))D0?}wW4X8(Nl;twzS3%+DN*P3P#6a3F2;kY?bTIz%>uh2A)EGQ8 zjt8NFKLBZa=SiQ~!b20#)~;r{?tvJ3J^2r5*O z3Tdxa!Wwb}BciZYhHqLg1apck&J-o4#ObE;2!J4r$4bWFcO5IvRtPTm#)6B>cKg7S z8!sJy9N*r|8ofKp61gAE)=4SpCq)?FzeK)%ac(e z$igCbD{WF&D~(fhBY;6d>aEvy?L5tL6NAg)7{4x7`qR&o#@Xb4Qbt?0yJ(_P5SPuL zmMOf)ihJ(n@ckZVEa6sE6r_0^1jB!gt*@Y*nz^XyJN@7mbP;(yIK0)Ufr)i}5K z@)y92)8e@C^KmuOH@%)`qJ$)zb-!0apQnRgpOVPdz3BHoTqlDwfg$KhYq$kTt}5~5 zOas7-5ZZ!3fD0#-91j1x77aa2($M)+S45EH_>8qbp2C$st>#7{qTqKFHCS_^uJXNM#(+L#Xg?7K+v(59ZV|vn}Wyi1D zEXcUQmq94fT>+w)uZCam7Gx2BL`z$cm9kZo-eT#+4OU&2OBo-7I>bFJEdh&c03@9? zw9(Yo!TxS9iD=}fMhUp&!^82Qr4r2rx!lqi6cmN9gbK6M^G1L0@XJbnlmN6Ho+Q&U z4<~nnF`nLEX491N_G3XAvcjt0&<7AI{qd(2A*b}Jb=gK@4&DOW5}6Hu$bPF$sD^jE zc1Wj`m}jl(Agrw~v0c%`Euh!S7Va{9Ej4gAoB>pC-WHl=LPw#itQw83YDTL7pdA>s z;J8(scTy;a62^MzctMi?2I%#1?^HXLTD~NoYW(mh?2fj}d0fGvrC?Z#8e@UB%frb@ z?{m&1z1+xZjJJfzzIOS4TV35VsVs#jdF>>ni7sZ_ysurZyLMS>j_D2ANqEgQa(tBx zx%70~7-W>r87yyVV3bE)adC8+Qqw;7#jH?VfJ3BB5K3x`(QcHbly4K_lkXC={1P@o%`AF@Jw^H&rdmCc`&?x9F4z>8kd8A@zbD;S^q&QWaP)= zqIkB~seoq&nB*LNpMj#S9 z5L{~7`G{s)zNTNlmKPUi*C||^3ub|~%8YhKFOORnaLodF`*V-K2}&^!S^n(aH`HQiIH$f_rTGmSh&V4mK#PVjSxO_ZJIMl8_~!swZ>y)EmZ88m0sYCwrh(kocoE*^vo-qYqx1Dt#H1cGsZ^7)vI;^ z`rxI%)Cs)8VkC-Ci(mY`dB6D2Gy3d#NJSo!AyGg6 zoA@bACyg_I`Y@*W|JEq2c0Z-?{bO~AhwmT`T6HbnRudPQsc|!Y)FmRB)Cvs1B9Y! zD)GdBq{~#KT*G_a(iWm6{|gmY^5Z|Vq?7lw+vtl*(l@}hp4mP->88pxe5Jj^(%*8U z@X}0FYm|=S1v%kj-3&5Vt#$Fhjz5p60k%CHkDext!`Wau{A&$t+v@D3!EN~G=<{Ti z3ikM_D#GDy6+CkuKPeial_=VdubS=7-s`o0`eh3g^3craR#!hv3A`==FH4L3lapRC z7YTh2;Vo}x#;K|Axj}X*NMjX;HH+UEnHpM}*K1Q)XMBrz5ia^WkYu3<(O6GvOa9eT zf{(A3b5M+|G8NWpKs|wwX~xzAU2ZpnhaX3%(ffQi`if^E4PwX1?8?8Nnn19VZY2bN z(}H2;P0`jaaHbUH#5=6fN;LORy3Lc6@$9BDera1e^9tr;ZH+W(nUvZKEoz8#iY9`9d5LO1sPnNcvSsvI*&zGK_t+^aImvE=r6$=qFw z1k7@!5_?JW)LjyjT22Lxic!v2_sD>M-H*qo{ZzxBW7UO(9WMzEQsHYIC!QWJ6vq{o zDM+~0;zjxoknNLZ?614Ytg$^9eVeT`$P4;3CL_lG{tBsCWi{eSNeo^n02^H5rIsTt z%gXxIW4al*+fggISbjH{;``aS88-F@Gkkh~w4@9VKPEC2b9v*emPC6tnX;WW!NfaiR0 zKg4gQ(Vk831`pM@CEFKq^!fhmpPrwcXL2buUi#JmH(@huM^1st)0WK&G`i?DPj;ec zRAzIM62K|X&0DD*;N1{!g-K`T4P!x$5k}RZaQz@<@A~K{fmU2m4!AaCzhNk>Jnlc{ zsIDb%cBIBgpjF6!?A_6SBDY_UZ_!eC=8dDL+T6&D#q;L0L-vCo?jjq>BEvWvtsyKs z>!eH+>5-Y5V3HY!Rb;RU2Gqn@iC>+5Q*UM!OKUosNyJL9B-6JEi9UkXeBqO})v1A5 zgQTo~$}beZN+Fn;dnh{LJXYt%h&UnimMj#Nr+{d%-iEXnhm+}l?Xa|v=bbye8E}Sd z1Tq8I<#38;t#LWJzaRWM#V3{-OJ1IHhy&R3BeV7KDXJ|7Va~ag<`wBaeklmU+gTW6 zxp#sr?_C_i$oLF@uN$n>q@y824JwPveS2UpQtB~4@&tGtN=*U0LM6g?DJIog(!^29 zy?0?z?7Ii-#w{#GDvI2W6;E}wu(YsPdLUxadmwpL@$2dVWP5f$d%CM!d9}NVt?%b& z=3$V^FyzpHfDufG^E85#^Q^Ybym!`6i~&e|shz;fgrs19DeHbKk$_1}r5FXn*P-y= z{-EJnB*2VTCg&AC2 z%&UcC+L(~cmAV)pd8ms~ZOm9=)lwR*nUNd|WNY~XwOYn9ggVY>APn9h<5hL6T6O?b z=OiT!lgt4n*I>zO4VL{n5e$dF0Q{GbPU6pEmE`Z*uRkUuU&7$&k`e zz8L<0fX)e%9oa5N!|}L!pZ~J68;7*#XGZaCt5SXDkOP76j+-zc(B|2=Xcek$^_xBc zYX8r)6J36Cc3@IDZMjC|9)(qwwDx)!V>|)!U;~k z$$0&hK%$FYb2-1fy62(Sw73a?zY(x;u1Gz7rnsb`o-)X<-X5yF_EMOX<+P*jgEHV0 z7^`(+g-AJCtg$2^RG_KJAHcHX**IvF8S2(w?4;1^`AG@%s+bjy=p`x5DHz?%@t!w- zyi`>9_H_cdHXAXDmU1nXIn!uXn`^$OOe3SY4E zJX63OVitb4$bC|V(+1BX=g)a_g4>XPU+dm+u6<31R-!xmsvzNPOnfJL}YaR`r8P4izZ#mDIB-3TZ z4M-)!v&Z%GKf06I=&`XieIRQyyYX#h5B_>o~|QJU9>E6j=LssQ|PM zoJX=4!l$TzzwzPTEc%sv=@EmOHSz`CuTZu`SjNQk8!2Tj}=e;6Ze+=^Nm zON!XJ(ExtjA}Dih&wjZtS*f)zl8HvoPfAT9E0$-HDZzzzKIBo+G-L(`^jC=@t+U%q zwd}JPP;=Fyy`$XVR@=6t@l2CVfTETKULY0e=W2Mv4|_cNI=pTC)HuX5w1{+n=cCVe z^fRnc&0YVTSc&}cC8H>}+}m1p>ms)!SP2z$O;1t0bbQT9Yo490=5gGbr#ewJT2j@9 zjLln$osIkSDA109(#j~w6@o+!ij0pAKJfjNn2cPtKr2apiIN&Eqx_y!BQoa91k4c&+eZnkqFDN>Kvt>(f+^6pbl_ zF=>?MIxdOT-jKxuxAPXfF*ShL$+c1k*XhcQ_6U_QTp~?1JT8b;mI8x+6moAz$>AYc z+4kgqayuS0_Gh>Eqv8F-h^&fTh**Nu{J)JQpExr#G7sjhP^3br7`m~=%kDu3=gYKQiVeQ4EGtEND zn9yO>rh>eJ3q%rICVDr2IR{-0Zqfiv)aGe!p4LI*MVdg=U|fPwUN|sy81ndCIOAI> zzY9e&WRjPEk!;pvH{|)Fw%AIc z@vSfxIVuOIJ*=(mD2H?Jgta7LE#aSGt>p|ng zKkW46eggdPgEjbb2wEwh=h(#wDtS*@qpc$g#xOzM8R2^|8c#lb`n1m)+pKXmcznV$ zxyBsg{Fo>ApU&}rSCX;J<7^(l6e#lq(_WR^eKLgs{{sO0?>O7;lWYNR$;^hbf7I2Z z!xx!3>9w#L{GyX-E`9C4d;6)JnhiK@EjU9;59FT-J6QvgA&60imPAq;8!x2oWVzTV zJMQS9)9qbD`+T|31NzxVt~{_G!v;poKzOeKI3gr6+*M6f1SJ0)8w(-4*E_% zX@>pdQ9n^NIQW8pr`9(shWKI~XDzLvy5O0b+i(d0o*}vpbv4~+ z^k(qI;2;Fv^4hJv$XSxJe!CeDzcr3V z?D4_X;Z_3f1TbZ2h_CS`#iC5a+j10ChxH90&jsmd=QV(LU7Fb+&&HF#=-wQyvmVt; zyP#1|DL7vJxpc!kSzBf&Rg=QgIRi0DBoIQADspq(lZMq3W>`0p_{F40{vi2`weF8wvec zoAeC?kuTCy;jQ5G+9{glsm zmI@L6@#Qjg-854c%$zp_ZdWTQD9$41SP6MMTg?w~*V+vbMPuk*XIiK*c%G9zY-@RH5?s>_pt~qb5N) zz&(oMC>hP#^Z11Zbp78Xc!`ErQDY%nw8SUKe2Wd}Q)!x&*?kMg#XO|m0qq?0mV&&O zxmeou@bvip(`1fKZuZ=K?DlWN{jf`7SXD9y<7j|&OzL720@4-H_t@DYgyqM7&r|b; zSh&MHj93AKAjC|W2`MFNU|R~%F?w2nx%J!imfAjpWUNF~nWcVXB3{{;PuoZpjiGR} zt+G(#nPSn8f2>WQwAnV%4$tnKXU?rXE@mp#kw?b1CUAeLEiozD;q|2-p7&?B!^7)K zeKN;Qze+>e*S(W~Ru=^6nzjvR;AGJw`%wi#J_H{zHGflr+@+Nu_1fLw$u{G84gzU1 z6`MkVA!V^bqSxC6fQ>FM+|??Z%5C)#(avPM;0%h5A diff --git a/test/functional/fixtures/opensearch_archiver/visualize/data.json b/test/functional/fixtures/opensearch_archiver/visualize/data.json index d38fbc3a27c5..b3245fb765e6 100644 --- a/test/functional/fixtures/opensearch_archiver/visualize/data.json +++ b/test/functional/fixtures/opensearch_archiver/visualize/data.json @@ -203,7 +203,7 @@ "index": ".kibana", "source": { "index-pattern": { - "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"opensearchTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"opensearchTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"opensearchTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"opensearchTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"message\",\"type\":\"string\",\"opensearchTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"message.keyword\",\"type\":\"string\",\"opensearchTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"message\"}}},{\"name\":\"user\",\"type\":\"string\",\"opensearchTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"user.keyword\",\"type\":\"string\",\"opensearchTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"user\"}}}]", + "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"message\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"message.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"message\"}}},{\"name\":\"user\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"user.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"user\"}}}]", "title": "test_index*" }, "type": "test_index*"