Skip to content

Commit 6d301d4

Browse files
kibanamachinekibanamachine
authored
Merge branch '7.x' into backport/7.x/pr-101846
2 parents 9ea1368 + dfda99b commit 6d301d4

100 files changed

Lines changed: 802 additions & 743 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ esFilters: {
1313
FILTERS: typeof FILTERS;
1414
FilterStateStore: typeof FilterStateStore;
1515
buildEmptyFilter: (isPinned: boolean, index?: string | undefined) => import("../common").Filter;
16-
buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").IIndexPattern) => import("../common").PhrasesFilter;
17-
buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").IIndexPattern) => import("../common").ExistsFilter;
18-
buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").IIndexPattern) => import("../common").PhraseFilter;
16+
buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").IndexPatternBase) => import("../common").PhrasesFilter;
17+
buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").IndexPatternBase) => import("../common").ExistsFilter;
18+
buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").IndexPatternBase) => import("../common").PhraseFilter;
1919
buildQueryFilter: (query: any, index: string, alias: string) => import("../common").QueryStringFilter;
20-
buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").IIndexPattern, formattedValue?: string | undefined) => import("../common").RangeFilter;
20+
buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").IndexPatternBase, formattedValue?: string | undefined) => import("../common").RangeFilter;
2121
isPhraseFilter: (filter: any) => filter is import("../common").PhraseFilter;
2222
isExistsFilter: (filter: any) => filter is import("../common").ExistsFilter;
2323
isPhrasesFilter: (filter: any) => filter is import("../common").PhrasesFilter;

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
esKuery: {
1111
nodeTypes: import("../common/es_query/kuery/node_types").NodeTypes;
1212
fromKueryExpression: (expression: any, parseOptions?: Partial<import("../common").KueryParseOptions>) => import("../common").KueryNode;
13-
toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
13+
toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IndexPatternBase | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
1414
}
1515
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
esQuery: {
1111
buildEsQuery: typeof buildEsQuery;
1212
getEsQueryConfig: typeof getEsQueryConfig;
13-
buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").IIndexPattern | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
13+
buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").IndexPatternBase | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
1414
must: never[];
1515
filter: import("../common").Filter[];
1616
should: never[];

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.fields.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.id.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,15 @@
1212
<b>Signature:</b>
1313

1414
```typescript
15-
export interface IIndexPattern
15+
export interface IIndexPattern extends IndexPatternBase
1616
```
1717
1818
## Properties
1919
2020
| Property | Type | Description |
2121
| --- | --- | --- |
2222
| [fieldFormatMap](./kibana-plugin-plugins-data-public.iindexpattern.fieldformatmap.md) | <code>Record&lt;string, SerializedFieldFormat&lt;unknown&gt; &#124; undefined&gt;</code> | |
23-
| [fields](./kibana-plugin-plugins-data-public.iindexpattern.fields.md) | <code>IFieldType[]</code> | |
2423
| [getFormatterForField](./kibana-plugin-plugins-data-public.iindexpattern.getformatterforfield.md) | <code>(field: IndexPatternField &#124; IndexPatternField['spec'] &#124; IFieldType) =&gt; FieldFormat</code> | Look up a formatter for a given field |
25-
| [id](./kibana-plugin-plugins-data-public.iindexpattern.id.md) | <code>string</code> | |
2624
| [intervalName](./kibana-plugin-plugins-data-public.iindexpattern.intervalname.md) | <code>string &#124; null</code> | |
2725
| [timeFieldName](./kibana-plugin-plugins-data-public.iindexpattern.timefieldname.md) | <code>string</code> | |
2826
| [title](./kibana-plugin-plugins-data-public.iindexpattern.title.md) | <code>string</code> | |

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.esfilters.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ esFilters: {
1111
buildQueryFilter: (query: any, index: string, alias: string) => import("../common").QueryStringFilter;
1212
buildCustomFilter: typeof buildCustomFilter;
1313
buildEmptyFilter: (isPinned: boolean, index?: string | undefined) => import("../common").Filter;
14-
buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").IIndexPattern) => import("../common").ExistsFilter;
14+
buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").MinimalIndexPattern) => import("../common").ExistsFilter;
1515
buildFilter: typeof buildFilter;
16-
buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").IIndexPattern) => import("../common").PhraseFilter;
17-
buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").IIndexPattern) => import("../common").PhrasesFilter;
18-
buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").IIndexPattern, formattedValue?: string | undefined) => import("../common").RangeFilter;
16+
buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").MinimalIndexPattern) => import("../common").PhraseFilter;
17+
buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").MinimalIndexPattern) => import("../common").PhrasesFilter;
18+
buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").MinimalIndexPattern, formattedValue?: string | undefined) => import("../common").RangeFilter;
1919
isFilterDisabled: (filter: import("../common").Filter) => boolean;
2020
}
2121
```

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.eskuery.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
esKuery: {
1111
nodeTypes: import("../common/es_query/kuery/node_types").NodeTypes;
1212
fromKueryExpression: (expression: any, parseOptions?: Partial<import("../common").KueryParseOptions>) => import("../common").KueryNode;
13-
toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IIndexPattern | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
13+
toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").MinimalIndexPattern | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
1414
}
1515
```

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.esquery.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
```typescript
1010
esQuery: {
11-
buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").IIndexPattern | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
11+
buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").MinimalIndexPattern | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
1212
must: never[];
1313
filter: import("../common").Filter[];
1414
should: never[];

‎src/plugins/data/common/es_query/es_query/build_es_query.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import { groupBy, has, isEqual } from 'lodash';
1010
import { buildQueryFromKuery } from './from_kuery';
1111
import { buildQueryFromFilters } from './from_filters';
1212
import { buildQueryFromLucene } from './from_lucene';
13-
import { IIndexPattern } from '../../index_patterns';
1413
import { Filter } from '../filters';
1514
import { Query } from '../../query/types';
15+
import { IndexPatternBase } from './types';
1616

1717
export interface EsQueryConfig {
1818
allowLeadingWildcards: boolean;
@@ -36,7 +36,7 @@ function removeMatchAll<T>(filters: T[]) {
3636
* config contains dateformat:tz
3737
*/
3838
export function buildEsQuery(
39-
indexPattern: IIndexPattern | undefined,
39+
indexPattern: IndexPatternBase | undefined,
4040
queries: Query | Query[],
4141
filters: Filter | Filter[],
4242
config: EsQueryConfig = {

0 commit comments

Comments
 (0)