Merge branch '7.x' into backport/7.x/pr-103863

.eslintrc.js

@@ -452,6 +452,7 @@ module.exports = {
                   '!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,mjs,ts}',
                   '!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,mjs,ts,tsx}',
                   '!(src|x-pack)/plugins/**/__stories__/index.{js,mjs,ts,tsx}',
+                  '!(src|x-pack)/plugins/**/__fixtures__/index.{js,mjs,ts,tsx}',
                 ],
                 allowSameFolder: true,
                 errorMessage: 'Plugins may only import from top-level public and server modules.',

.i18nrc.json

@@ -18,6 +18,7 @@
     "expressions": "src/plugins/expressions",
     "expressionError": "src/plugins/expression_error",
     "expressionRevealImage": "src/plugins/expression_reveal_image",
+    "expressionShape": "src/plugins/expression_shape",
     "inputControl": "src/plugins/input_control_vis",
     "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",
@@ -28,6 +29,7 @@
     "management": ["src/legacy/core_plugins/management", "src/plugins/management"],
     "maps_legacy": "src/plugins/maps_legacy",
     "monaco": "packages/kbn-monaco/src",
+    "esQuery": "packages/kbn-es-query/src",
     "presentationUtil": "src/plugins/presentation_util",
     "indexPatternFieldEditor": "src/plugins/index_pattern_field_editor",
     "indexPatternManagement": "src/plugins/index_pattern_management",

docs/developer/plugin-list.asciidoc

@@ -97,6 +97,10 @@ want to incorporate their own functions, types, and renderers into the service
 for use in their own application.
 
 
+|{kib-repo}blob/{branch}/src/plugins/expression_shape/README.md[expressionShape]
+|Expression Shape plugin adds a shape function to the expression plugin and an associated renderer. The renderer will display the given shape with selected decorations.
+
+
 |{kib-repo}blob/{branch}/src/plugins/home/README.md[home]
 |Moves the legacy ui/registry/feature_catalogue module for registering "features" that should be shown in the home page's feature catalogue to a service within a "home" plugin. The feature catalogue refered to here should not be confused with the "feature" plugin for registering features used to derive UI capabilities for feature controls.
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.getsearchsourcetimefilter.md

@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-getSearchSourceTimeFilter(forceNow?: Date): RangeFilter[] | {
+getSearchSourceTimeFilter(forceNow?: Date): import("@kbn/es-query").RangeFilter[] | {
         meta: {
             index: string | undefined;
             params: {};
@@ -43,7 +43,7 @@ getSearchSourceTimeFilter(forceNow?: Date): RangeFilter[] | {
 
 <b>Returns:</b>
 
-`RangeFilter[] | {
+`import("@kbn/es-query").RangeFilter[] | {
         meta: {
             index: string | undefined;
             params: {};

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.customfilter.md

@@ -4,10 +4,13 @@
 
 ## CustomFilter type
 
+> Warning: This API is now obsolete.
+> 
+> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0.
+> 
+
 <b>Signature:</b>
 
 ```typescript
-export declare type CustomFilter = Filter & {
-    query: any;
-};
+declare type CustomFilter = oldCustomFilter;
 ```

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

@@ -10,23 +10,23 @@
 esFilters: {
     FilterLabel: (props: import("./ui/filter_bar/filter_editor/lib/filter_label").FilterLabelProps) => JSX.Element;
     FilterItem: (props: import("./ui/filter_bar/filter_item").FilterItemProps) => JSX.Element;
-    FILTERS: typeof FILTERS;
+    FILTERS: typeof import("@kbn/es-query").FILTERS;
     FilterStateStore: typeof FilterStateStore;
-    buildEmptyFilter: (isPinned: boolean, index?: string | undefined) => import("../common").Filter;
-    buildPhrasesFilter: (field: import("../common").IndexPatternFieldBase, params: any[], indexPattern: import("../common").IndexPatternBase) => import("../common").PhrasesFilter;
-    buildExistsFilter: (field: import("../common").IndexPatternFieldBase, indexPattern: import("../common").IndexPatternBase) => import("../common").ExistsFilter;
-    buildPhraseFilter: (field: import("../common").IndexPatternFieldBase, value: any, indexPattern: import("../common").IndexPatternBase) => import("../common").PhraseFilter;
-    buildQueryFilter: (query: any, index: string, alias: string) => import("../common").QueryStringFilter;
-    buildRangeFilter: (field: import("../common").IndexPatternFieldBase, params: import("../common").RangeFilterParams, indexPattern: import("../common").IndexPatternBase, formattedValue?: string | undefined) => import("../common").RangeFilter;
-    isPhraseFilter: (filter: any) => filter is import("../common").PhraseFilter;
-    isExistsFilter: (filter: any) => filter is import("../common").ExistsFilter;
-    isPhrasesFilter: (filter: any) => filter is import("../common").PhrasesFilter;
-    isRangeFilter: (filter: any) => filter is import("../common").RangeFilter;
-    isMatchAllFilter: (filter: any) => filter is import("../common").MatchAllFilter;
-    isMissingFilter: (filter: any) => filter is import("../common").MissingFilter;
-    isQueryStringFilter: (filter: any) => filter is import("../common").QueryStringFilter;
-    isFilterPinned: (filter: import("../common").Filter) => boolean | undefined;
-    toggleFilterNegated: (filter: import("../common").Filter) => {
+    buildEmptyFilter: (isPinned: boolean, index?: string | undefined) => import("@kbn/es-query").Filter;
+    buildPhrasesFilter: (field: import("@kbn/es-query").IndexPatternFieldBase, params: any[], indexPattern: import("@kbn/es-query").IndexPatternBase) => import("@kbn/es-query").PhrasesFilter;
+    buildExistsFilter: (field: import("@kbn/es-query").IndexPatternFieldBase, indexPattern: import("@kbn/es-query").IndexPatternBase) => import("@kbn/es-query").ExistsFilter;
+    buildPhraseFilter: (field: import("@kbn/es-query").IndexPatternFieldBase, value: any, indexPattern: import("@kbn/es-query").IndexPatternBase) => import("@kbn/es-query").PhraseFilter;
+    buildQueryFilter: (query: any, index: string, alias: string) => import("@kbn/es-query").QueryStringFilter;
+    buildRangeFilter: (field: import("@kbn/es-query").IndexPatternFieldBase, params: import("@kbn/es-query").RangeFilterParams, indexPattern: import("@kbn/es-query").IndexPatternBase, formattedValue?: string | undefined) => import("@kbn/es-query").RangeFilter;
+    isPhraseFilter: (filter: any) => filter is import("@kbn/es-query").PhraseFilter;
+    isExistsFilter: (filter: any) => filter is import("@kbn/es-query").ExistsFilter;
+    isPhrasesFilter: (filter: any) => filter is import("@kbn/es-query").PhrasesFilter;
+    isRangeFilter: (filter: any) => filter is import("@kbn/es-query").RangeFilter;
+    isMatchAllFilter: (filter: any) => filter is import("@kbn/es-query").MatchAllFilter;
+    isMissingFilter: (filter: any) => filter is import("@kbn/es-query").MissingFilter;
+    isQueryStringFilter: (filter: any) => filter is import("@kbn/es-query").QueryStringFilter;
+    isFilterPinned: (filter: import("@kbn/es-query").Filter) => boolean | undefined;
+    toggleFilterNegated: (filter: import("@kbn/es-query").Filter) => {
         meta: {
             negate: boolean;
             alias: string | null;
@@ -39,20 +39,20 @@ esFilters: {
             params?: any;
             value?: string | undefined;
         };
-        $state?: import("../common").FilterState | undefined;
+        $state?: import("@kbn/es-query/target_types/filters/types").FilterState | undefined;
         query?: any;
     };
-    disableFilter: (filter: import("../common").Filter) => import("../common").Filter;
-    getPhraseFilterField: (filter: import("../common").PhraseFilter) => string;
-    getPhraseFilterValue: (filter: import("../common").PhraseFilter) => string | number | boolean;
+    disableFilter: (filter: import("@kbn/es-query").Filter) => import("@kbn/es-query").Filter;
+    getPhraseFilterField: (filter: import("@kbn/es-query").PhraseFilter) => string;
+    getPhraseFilterValue: (filter: import("@kbn/es-query").PhraseFilter) => string | number | boolean;
     getDisplayValueFromFilter: typeof getDisplayValueFromFilter;
-    compareFilters: (first: import("../common").Filter | import("../common").Filter[], second: import("../common").Filter | import("../common").Filter[], comparatorOptions?: import("../common").FilterCompareOptions) => boolean;
+    compareFilters: (first: import("@kbn/es-query").Filter | import("@kbn/es-query").Filter[], second: import("@kbn/es-query").Filter | import("@kbn/es-query").Filter[], comparatorOptions?: import("../common").FilterCompareOptions) => boolean;
     COMPARE_ALL_OPTIONS: import("../common").FilterCompareOptions;
     generateFilters: typeof generateFilters;
-    onlyDisabledFiltersChanged: (newFilters?: import("../common").Filter[] | undefined, oldFilters?: import("../common").Filter[] | undefined) => boolean;
+    onlyDisabledFiltersChanged: (newFilters?: import("@kbn/es-query").Filter[] | undefined, oldFilters?: import("@kbn/es-query").Filter[] | undefined) => boolean;
     changeTimeFilter: typeof changeTimeFilter;
     convertRangeFilterToTimeRangeString: typeof convertRangeFilterToTimeRangeString;
-    mapAndFlattenFilters: (filters: import("../common").Filter[]) => import("../common").Filter[];
+    mapAndFlattenFilters: (filters: import("@kbn/es-query").Filter[]) => import("@kbn/es-query").Filter[];
     extractTimeFilter: typeof extractTimeFilter;
     extractTimeRange: typeof extractTimeRange;
 }

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

@@ -4,12 +4,17 @@
 
 ## esKuery variable
 
+> Warning: This API is now obsolete.
+> 
+> Please import helpers from the package kbn/es-query directly. This import will be deprecated in v8.0.0.
+> 
+
 <b>Signature:</b>
 
 ```typescript
 esKuery: {
-    nodeTypes: import("../common/es_query/kuery/node_types").NodeTypes;
-    fromKueryExpression: (expression: any, parseOptions?: Partial<import("../common").KueryParseOptions>) => import("../common").KueryNode;
-    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;
+    nodeTypes: import("@kbn/es-query/target_types/kuery/node_types").NodeTypes;
+    fromKueryExpression: (expression: any, parseOptions?: Partial<import("@kbn/es-query/target_types/kuery/types").KueryParseOptions> | undefined) => import("@kbn/es-query").KueryNode;
+    toElasticsearchQuery: (node: import("@kbn/es-query").KueryNode, indexPattern?: import("@kbn/es-query").IndexPatternBase | undefined, config?: Record<string, any> | undefined, context?: Record<string, any> | undefined) => import("@kbn/common-utils").JsonObject;
 }
 ```

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

@@ -4,19 +4,24 @@
 
 ## esQuery variable
 
+> Warning: This API is now obsolete.
+> 
+> Please import helpers from the package kbn/es-query directly. This import will be deprecated in v8.0.0.
+> 
+
 <b>Signature:</b>
 
 ```typescript
 esQuery: {
-    buildEsQuery: typeof buildEsQuery;
+    buildEsQuery: typeof import("@kbn/es-query").buildEsQuery;
     getEsQueryConfig: typeof getEsQueryConfig;
-    buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").IndexPatternBase | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => {
+    buildQueryFromFilters: (filters: import("@kbn/es-query").Filter[] | undefined, indexPattern: import("@kbn/es-query").IndexPatternBase | undefined, ignoreFilterIfFieldNotInIndex?: boolean | undefined) => {
         must: never[];
-        filter: import("../common").Filter[];
+        filter: import("@kbn/es-query").Filter[];
         should: never[];
-        must_not: import("../common").Filter[];
+        must_not: import("@kbn/es-query").Filter[];
     };
-    luceneStringToDsl: typeof luceneStringToDsl;
-    decorateQuery: typeof decorateQuery;
+    luceneStringToDsl: typeof import("@kbn/es-query").luceneStringToDsl;
+    decorateQuery: typeof import("@kbn/es-query").decorateQuery;
 }
 ```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esqueryconfig.md

@@ -2,20 +2,15 @@
 
 [Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [EsQueryConfig](./kibana-plugin-plugins-data-public.esqueryconfig.md)
 
-## EsQueryConfig interface
+## EsQueryConfig type
+
+> Warning: This API is now obsolete.
+> 
+> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0.
+> 
 
 <b>Signature:</b>
 
 ```typescript
-export interface EsQueryConfig 
+declare type EsQueryConfig = oldEsQueryConfig;
 ```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [allowLeadingWildcards](./kibana-plugin-plugins-data-public.esqueryconfig.allowleadingwildcards.md) | <code>boolean</code> |  |
-|  [dateFormatTZ](./kibana-plugin-plugins-data-public.esqueryconfig.dateformattz.md) | <code>string</code> |  |
-|  [ignoreFilterIfFieldNotInIndex](./kibana-plugin-plugins-data-public.esqueryconfig.ignorefilteriffieldnotinindex.md) | <code>boolean</code> |  |
-|  [queryStringOptions](./kibana-plugin-plugins-data-public.esqueryconfig.querystringoptions.md) | <code>Record&lt;string, any&gt;</code> |  |
-

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.existsfilter.md

@@ -4,11 +4,13 @@
 
 ## ExistsFilter type
 
+> Warning: This API is now obsolete.
+> 
+> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0.
+> 
+
 <b>Signature:</b>
 
 ```typescript
-export declare type ExistsFilter = Filter & {
-    meta: ExistsFilterMeta;
-    exists?: FilterExistsProperty;
-};
+declare type ExistsFilter = oldExistsFilter;
 ```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filter.md

@@ -4,12 +4,13 @@
 
 ## Filter type
 
+> Warning: This API is now obsolete.
+> 
+> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0.
+> 
+
 <b>Signature:</b>
 
 ```typescript
-export declare type Filter = {
-    $state?: FilterState;
-    meta: FilterMeta;
-    query?: any;
-};
+declare type Filter = oldFilter;
 ```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filtermanager.extract.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FilterManager](./kibana-plugin-plugins-data-public.filtermanager.md) &gt; [extract](./kibana-plugin-plugins-data-public.filtermanager.extract.md)
+
+## FilterManager.extract property
+
+<b>Signature:</b>
+
+```typescript
+extract: any;
+```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filtermanager.getallmigrations.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FilterManager](./kibana-plugin-plugins-data-public.filtermanager.md) &gt; [getAllMigrations](./kibana-plugin-plugins-data-public.filtermanager.getallmigrations.md)
+
+## FilterManager.getAllMigrations property
+
+<b>Signature:</b>
+
+```typescript
+getAllMigrations: () => {};
+```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filtermanager.inject.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FilterManager](./kibana-plugin-plugins-data-public.filtermanager.md) &gt; [inject](./kibana-plugin-plugins-data-public.filtermanager.inject.md)
+
+## FilterManager.inject property
+
+<b>Signature:</b>
+
+```typescript
+inject: any;
+```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filtermanager.migratetolatest.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FilterManager](./kibana-plugin-plugins-data-public.filtermanager.md) &gt; [migrateToLatest](./kibana-plugin-plugins-data-public.filtermanager.migratetolatest.md)
+
+## FilterManager.migrateToLatest property
+
+<b>Signature:</b>
+
+```typescript
+migrateToLatest: any;
+```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filtermanager.telemetry.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FilterManager](./kibana-plugin-plugins-data-public.filtermanager.md) &gt; [telemetry](./kibana-plugin-plugins-data-public.filtermanager.telemetry.md)
+
+## FilterManager.telemetry property
+
+<b>Signature:</b>
+
+```typescript
+telemetry: (filters: import("../../../../kibana_utils/common/persistable_state").SerializableState, collector: unknown) => {};
+```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.gettime.md

@@ -10,7 +10,7 @@
 export declare function getTime(indexPattern: IIndexPattern | undefined, timeRange: TimeRange, options?: {
     forceNow?: Date;
     fieldName?: string;
-}): import("../..").RangeFilter | undefined;
+}): import("@kbn/es-query").RangeFilter | undefined;
 ```
 
 ## Parameters
@@ -23,5 +23,5 @@ export declare function getTime(indexPattern: IIndexPattern | undefined, timeRan
 
 <b>Returns:</b>
 
-`import("../..").RangeFilter | undefined`
+`import("@kbn/es-query").RangeFilter | undefined`