(fieldName: string) => void | |
+| [fieldAttrs](./kibana-plugin-plugins-data-public.indexpattern.fieldattrs.md) | | FieldAttrs | |
| [fieldFormatMap](./kibana-plugin-plugins-data-public.indexpattern.fieldformatmap.md) | | Record<string, any> | |
| [fields](./kibana-plugin-plugins-data-public.indexpattern.fields.md) | | IIndexPatternFieldList & { toSpec: () => IndexPatternFieldMap; } | |
| [flattenHit](./kibana-plugin-plugins-data-public.indexpattern.flattenhit.md) | | (hit: Record<string, any>, deep?: boolean) => Record<string, any> | |
| [formatField](./kibana-plugin-plugins-data-public.indexpattern.formatfield.md) | | FormatFieldFn | |
| [formatHit](./kibana-plugin-plugins-data-public.indexpattern.formathit.md) | | { (hit: Record<string, any>, type?: string): any; formatField: FormatFieldFn; } | |
-| [getOriginalSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md) | | () => { attributes?: IndexPatternAttrs | undefined; title?: string | undefined; timeFieldName?: string | undefined; intervalName?: string | undefined; fields?: string | undefined; sourceFilters?: string | undefined; fieldFormatMap?: string | undefined; typeMeta?: string | undefined; type?: string | undefined; } | Get last saved saved object fields |
+| [getFieldAttrs](./kibana-plugin-plugins-data-public.indexpattern.getfieldattrs.md) | | () => { [x: string]: { customName: string; }; } | |
+| [getOriginalSavedObjectBody](./kibana-plugin-plugins-data-public.indexpattern.getoriginalsavedobjectbody.md) | | () => { fieldAttrs?: string | undefined; title?: string | undefined; timeFieldName?: string | undefined; intervalName?: string | undefined; fields?: string | undefined; sourceFilters?: string | undefined; fieldFormatMap?: string | undefined; typeMeta?: string | undefined; type?: string | undefined; } | Get last saved saved object fields |
| [id](./kibana-plugin-plugins-data-public.indexpattern.id.md) | | string | |
| [intervalName](./kibana-plugin-plugins-data-public.indexpattern.intervalname.md) | | string | undefined | |
| [metaFields](./kibana-plugin-plugins-data-public.indexpattern.metafields.md) | | string[] | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.attributes.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.fieldattrs.md
similarity index 64%
rename from docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.attributes.md
rename to docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.fieldattrs.md
index 9ad7c02f551cb..6af981eb6996c 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.attributes.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.fieldattrs.md
@@ -1,11 +1,11 @@
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [IndexPatternAttributes](./kibana-plugin-plugins-data-public.indexpatternattributes.md) > [attributes](./kibana-plugin-plugins-data-public.indexpatternattributes.attributes.md)
+[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [IndexPatternAttributes](./kibana-plugin-plugins-data-public.indexpatternattributes.md) > [fieldAttrs](./kibana-plugin-plugins-data-public.indexpatternattributes.fieldattrs.md)
-## IndexPatternAttributes.attributes property
+## IndexPatternAttributes.fieldAttrs property
Signature:
```typescript
-attributes?: IndexPatternAttrs;
+fieldAttrs?: string;
```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.md
index 9714d15a603d4..c5ea38278e820 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternattributes.md
@@ -14,7 +14,7 @@ export interface IndexPatternAttributes
| Property | Type | Description |
| --- | --- | --- |
-| [attributes](./kibana-plugin-plugins-data-public.indexpatternattributes.attributes.md) | IndexPatternAttrs | |
+| [fieldAttrs](./kibana-plugin-plugins-data-public.indexpatternattributes.fieldattrs.md) | string | |
| [fieldFormatMap](./kibana-plugin-plugins-data-public.indexpatternattributes.fieldformatmap.md) | string | |
| [fields](./kibana-plugin-plugins-data-public.indexpatternattributes.fields.md) | string | |
| [intervalName](./kibana-plugin-plugins-data-public.indexpatternattributes.intervalname.md) | string | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.attributes.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.fieldattrs.md
similarity index 54%
rename from docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.attributes.md
rename to docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.fieldattrs.md
index 8d068dd270f6f..e558c3ab19189 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.attributes.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.fieldattrs.md
@@ -1,11 +1,11 @@
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) > [attributes](./kibana-plugin-plugins-data-public.indexpatternspec.attributes.md)
+[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [IndexPatternSpec](./kibana-plugin-plugins-data-public.indexpatternspec.md) > [fieldAttrs](./kibana-plugin-plugins-data-public.indexpatternspec.fieldattrs.md)
-## IndexPatternSpec.attributes property
+## IndexPatternSpec.fieldAttrs property
Signature:
```typescript
-attributes?: IndexPatternAttrs;
+fieldAttrs?: FieldAttrs;
```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.md
index 89aefea9d74f1..06917fcac1b4d 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternspec.md
@@ -14,7 +14,7 @@ export interface IndexPatternSpec
| Property | Type | Description |
| --- | --- | --- |
-| [attributes](./kibana-plugin-plugins-data-public.indexpatternspec.attributes.md) | IndexPatternAttrs | |
+| [fieldAttrs](./kibana-plugin-plugins-data-public.indexpatternspec.fieldattrs.md) | FieldAttrs | |
| [fieldFormats](./kibana-plugin-plugins-data-public.indexpatternspec.fieldformats.md) | Record<string, SerializedFieldFormat> | |
| [fields](./kibana-plugin-plugins-data-public.indexpatternspec.fields.md) | IndexPatternFieldMap | |
| [id](./kibana-plugin-plugins-data-public.indexpatternspec.id.md) | string | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.fieldarraytomap.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.fieldarraytomap.md
index 1da5a621a1726..2a09d5b3adb1d 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.fieldarraytomap.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.fieldarraytomap.md
@@ -9,5 +9,5 @@ Converts field array to map
Signature:
```typescript
-fieldArrayToMap: (fields: FieldSpec[], fieldAttrs?: IndexPatternAttrsFields | undefined) => Record(id?: string | undefined) => void | Clear index pattern list cache |
| [ensureDefaultIndexPattern](./kibana-plugin-plugins-data-public.indexpatternsservice.ensuredefaultindexpattern.md) | | EnsureDefaultIndexPattern | |
-| [fieldArrayToMap](./kibana-plugin-plugins-data-public.indexpatternsservice.fieldarraytomap.md) | | (fields: FieldSpec[], fieldAttrs?: IndexPatternAttrsFields | undefined) => Record<string, FieldSpec> | Converts field array to map |
+| [fieldArrayToMap](./kibana-plugin-plugins-data-public.indexpatternsservice.fieldarraytomap.md) | | (fields: FieldSpec[], fieldAttrs?: FieldAttrs | undefined) => Record<string, FieldSpec> | Converts field array to map |
| [get](./kibana-plugin-plugins-data-public.indexpatternsservice.get.md) | | (id: string) => Promise<IndexPattern> | Get an index pattern by id. Cache optimized |
| [getCache](./kibana-plugin-plugins-data-public.indexpatternsservice.getcache.md) | | () => Promise<SavedObject<IndexPatternSavedObjectAttrs>[] | null | undefined> | |
| [getDefault](./kibana-plugin-plugins-data-public.indexpatternsservice.getdefault.md) | | () => Promise<IndexPattern | null> | Get default index pattern |
-| [getFieldsForIndexPattern](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md) | | (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions) => Promise<any> | Get field list by providing an index patttern (or spec) |
-| [getFieldsForWildcard](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md) | | (options?: GetFieldsOptions) => Promise<any> | Get field list by providing { pattern } |
+| [getFieldsForIndexPattern](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md) | | (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions | undefined) => Promise<any> | Get field list by providing an index patttern (or spec) |
+| [getFieldsForWildcard](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md) | | (options: GetFieldsOptions) => Promise<any> | Get field list by providing { pattern } |
| [getIds](./kibana-plugin-plugins-data-public.indexpatternsservice.getids.md) | | (refresh?: boolean) => Promise<string[]> | Get list of index pattern ids |
| [getIdsWithTitle](./kibana-plugin-plugins-data-public.indexpatternsservice.getidswithtitle.md) | | (refresh?: boolean) => Promise<Array<{ id: string; title: string; }>> | Get list of index pattern ids with titles |
| [getTitles](./kibana-plugin-plugins-data-public.indexpatternsservice.gettitles.md) | | (refresh?: boolean) => Promise<string[]> | Get list of index pattern titles |
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.kibanacontext.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kibanacontext.md
similarity index 51%
rename from docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.kibanacontext.md
rename to docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kibanacontext.md
index 108533e8de357..cb8842c66761d 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.kibanacontext.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kibanacontext.md
@@ -1,6 +1,6 @@
-[Home](./index.md) > [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) > [KibanaContext](./kibana-plugin-plugins-expressions-public.kibanacontext.md)
+[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [KibanaContext](./kibana-plugin-plugins-data-public.kibanacontext.md)
## KibanaContext type
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
index 255a9947858f6..bafcd8bdffff9 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -142,7 +142,11 @@
| [EsdslExpressionFunctionDefinition](./kibana-plugin-plugins-data-public.esdslexpressionfunctiondefinition.md) | |
| [EsQuerySortValue](./kibana-plugin-plugins-data-public.esquerysortvalue.md) | |
| [EsRawResponseExpressionTypeDefinition](./kibana-plugin-plugins-data-public.esrawresponseexpressiontypedefinition.md) | |
+| [ExecutionContextSearch](./kibana-plugin-plugins-data-public.executioncontextsearch.md) | |
| [ExistsFilter](./kibana-plugin-plugins-data-public.existsfilter.md) | |
+| [ExpressionFunctionKibana](./kibana-plugin-plugins-data-public.expressionfunctionkibana.md) | |
+| [ExpressionFunctionKibanaContext](./kibana-plugin-plugins-data-public.expressionfunctionkibanacontext.md) | |
+| [ExpressionValueSearchContext](./kibana-plugin-plugins-data-public.expressionvaluesearchcontext.md) | |
| [FieldFormatId](./kibana-plugin-plugins-data-public.fieldformatid.md) | id type is needed for creating custom converters. |
| [FieldFormatsContentType](./kibana-plugin-plugins-data-public.fieldformatscontenttype.md) | \* |
| [FieldFormatsGetConfigFn](./kibana-plugin-plugins-data-public.fieldformatsgetconfigfn.md) | |
@@ -161,6 +165,7 @@
| [InputTimeRange](./kibana-plugin-plugins-data-public.inputtimerange.md) | |
| [ISearchGeneric](./kibana-plugin-plugins-data-public.isearchgeneric.md) | |
| [ISearchSource](./kibana-plugin-plugins-data-public.isearchsource.md) | search source interface |
+| [KibanaContext](./kibana-plugin-plugins-data-public.kibanacontext.md) | |
| [MatchAllFilter](./kibana-plugin-plugins-data-public.matchallfilter.md) | |
| [ParsedInterval](./kibana-plugin-plugins-data-public.parsedinterval.md) | |
| [PhraseFilter](./kibana-plugin-plugins-data-public.phrasefilter.md) | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
index d1d20291a6799..bb45222d096a0 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
@@ -7,7 +7,7 @@
Signature:
```typescript
-SearchBar: React.ComponentClass{ [key: string]: any;} | |
+
+Returns:
+
+`{
+ [key: string]: any;
+}`
+
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.fieldattrs.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.fieldattrs.md
new file mode 100644
index 0000000000000..c8bad55dee2e4
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.fieldattrs.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IndexPattern](./kibana-plugin-plugins-data-server.indexpattern.md) > [fieldAttrs](./kibana-plugin-plugins-data-server.indexpattern.fieldattrs.md)
+
+## IndexPattern.fieldAttrs property
+
+Signature:
+
+```typescript
+fieldAttrs: FieldAttrs;
+```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getassavedobjectbody.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getassavedobjectbody.md
index a25681a005924..274a475872b0b 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getassavedobjectbody.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getassavedobjectbody.md
@@ -10,9 +10,7 @@ Returns index pattern as saved object body for saving
```typescript
getAsSavedObjectBody(): {
- attributes: {
- fields: import("../types").IndexPatternAttrsFields;
- } | undefined;
+ fieldAttrs: string | undefined;
title: string;
timeFieldName: string | undefined;
intervalName: string | undefined;
@@ -26,9 +24,7 @@ getAsSavedObjectBody(): {
Returns:
`{
- attributes: {
- fields: import("../types").IndexPatternAttrsFields;
- } | undefined;
+ fieldAttrs: string | undefined;
title: string;
timeFieldName: string | undefined;
intervalName: string | undefined;
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getfieldattrs.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getfieldattrs.md
new file mode 100644
index 0000000000000..80dd329232ed8
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getfieldattrs.md
@@ -0,0 +1,15 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IndexPattern](./kibana-plugin-plugins-data-server.indexpattern.md) > [getFieldAttrs](./kibana-plugin-plugins-data-server.indexpattern.getfieldattrs.md)
+
+## IndexPattern.getFieldAttrs property
+
+Signature:
+
+```typescript
+getFieldAttrs: () => {
+ [x: string]: {
+ customName: string;
+ };
+ };
+```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getoriginalsavedobjectbody.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getoriginalsavedobjectbody.md
index 48b692cf1e1f3..9923c82f389ad 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getoriginalsavedobjectbody.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getoriginalsavedobjectbody.md
@@ -10,7 +10,7 @@ Get last saved saved object fields
```typescript
getOriginalSavedObjectBody: () => {
- attributes?: IndexPatternAttrs | undefined;
+ fieldAttrs?: string | undefined;
title?: string | undefined;
timeFieldName?: string | undefined;
intervalName?: string | undefined;
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.md
index 97c7478fbf35e..3d2b021b29515 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.md
@@ -21,12 +21,14 @@ export declare class IndexPattern implements IIndexPattern
| Property | Modifiers | Type | Description |
| --- | --- | --- | --- |
| [deleteFieldFormat](./kibana-plugin-plugins-data-server.indexpattern.deletefieldformat.md) | | (fieldName: string) => void | |
+| [fieldAttrs](./kibana-plugin-plugins-data-server.indexpattern.fieldattrs.md) | | FieldAttrs | |
| [fieldFormatMap](./kibana-plugin-plugins-data-server.indexpattern.fieldformatmap.md) | | Record<string, any> | |
| [fields](./kibana-plugin-plugins-data-server.indexpattern.fields.md) | | IIndexPatternFieldList & { toSpec: () => IndexPatternFieldMap; } | |
| [flattenHit](./kibana-plugin-plugins-data-server.indexpattern.flattenhit.md) | | (hit: Record<string, any>, deep?: boolean) => Record<string, any> | |
| [formatField](./kibana-plugin-plugins-data-server.indexpattern.formatfield.md) | | FormatFieldFn | |
| [formatHit](./kibana-plugin-plugins-data-server.indexpattern.formathit.md) | | { (hit: Record<string, any>, type?: string): any; formatField: FormatFieldFn; } | |
-| [getOriginalSavedObjectBody](./kibana-plugin-plugins-data-server.indexpattern.getoriginalsavedobjectbody.md) | | () => { attributes?: IndexPatternAttrs | undefined; title?: string | undefined; timeFieldName?: string | undefined; intervalName?: string | undefined; fields?: string | undefined; sourceFilters?: string | undefined; fieldFormatMap?: string | undefined; typeMeta?: string | undefined; type?: string | undefined; } | Get last saved saved object fields |
+| [getFieldAttrs](./kibana-plugin-plugins-data-server.indexpattern.getfieldattrs.md) | | () => { [x: string]: { customName: string; }; } | |
+| [getOriginalSavedObjectBody](./kibana-plugin-plugins-data-server.indexpattern.getoriginalsavedobjectbody.md) | | () => { fieldAttrs?: string | undefined; title?: string | undefined; timeFieldName?: string | undefined; intervalName?: string | undefined; fields?: string | undefined; sourceFilters?: string | undefined; fieldFormatMap?: string | undefined; typeMeta?: string | undefined; type?: string | undefined; } | Get last saved saved object fields |
| [id](./kibana-plugin-plugins-data-server.indexpattern.id.md) | | string | |
| [intervalName](./kibana-plugin-plugins-data-server.indexpattern.intervalname.md) | | string | undefined | |
| [metaFields](./kibana-plugin-plugins-data-server.indexpattern.metafields.md) | | string[] | |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.attributes.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.fieldattrs.md
similarity index 64%
rename from docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.attributes.md
rename to docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.fieldattrs.md
index 5ad0c07af9e88..fded3ebac8b2c 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.attributes.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.fieldattrs.md
@@ -1,11 +1,11 @@
-[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IndexPatternAttributes](./kibana-plugin-plugins-data-server.indexpatternattributes.md) > [attributes](./kibana-plugin-plugins-data-server.indexpatternattributes.attributes.md)
+[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IndexPatternAttributes](./kibana-plugin-plugins-data-server.indexpatternattributes.md) > [fieldAttrs](./kibana-plugin-plugins-data-server.indexpatternattributes.fieldattrs.md)
-## IndexPatternAttributes.attributes property
+## IndexPatternAttributes.fieldAttrs property
Signature:
```typescript
-attributes?: IndexPatternAttrs;
+fieldAttrs?: string;
```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.md
index 8bdb0c90b28cb..6559b4d7110be 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternattributes.md
@@ -14,7 +14,7 @@ export interface IndexPatternAttributes
| Property | Type | Description |
| --- | --- | --- |
-| [attributes](./kibana-plugin-plugins-data-server.indexpatternattributes.attributes.md) | IndexPatternAttrs | |
+| [fieldAttrs](./kibana-plugin-plugins-data-server.indexpatternattributes.fieldattrs.md) | string | |
| [fieldFormatMap](./kibana-plugin-plugins-data-server.indexpatternattributes.fieldformatmap.md) | string | |
| [fields](./kibana-plugin-plugins-data-server.indexpatternattributes.fields.md) | string | |
| [intervalName](./kibana-plugin-plugins-data-server.indexpatternattributes.intervalname.md) | string | |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.getfieldsforwildcard.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.getfieldsforwildcard.md
index addd29916d81d..f0989097a727d 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.getfieldsforwildcard.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.getfieldsforwildcard.md
@@ -15,6 +15,8 @@ getFieldsForWildcard(options: {
fieldCapsOptions?: {
allow_no_indices: boolean;
};
+ type?: string;
+ rollupIndex?: string;
}): Promise{ pattern: string | string[]; metaFields?: string[]; fieldCapsOptions?: { allow_no_indices: boolean; }; } | |
+| options | { pattern: string | string[]; metaFields?: string[]; fieldCapsOptions?: { allow_no_indices: boolean; }; type?: string; rollupIndex?: string; } | |
Returns:
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.start.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.start.md
index e7c331bad64e8..6528b1c213cca 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.start.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsservice.start.md
@@ -8,7 +8,7 @@
```typescript
start(core: CoreStart, { fieldFormats, logger }: IndexPatternsServiceStartDeps): {
- indexPatternsServiceFactory: (savedObjectsClient: SavedObjectsClientContract) => Promisestring | |
| [input](./kibana-plugin-plugins-embeddable-public.embeddable.input.md) | | TEmbeddableInput | |
| [isContainer](./kibana-plugin-plugins-embeddable-public.embeddable.iscontainer.md) | | boolean | |
@@ -43,6 +44,7 @@ export declare abstract class EmbeddableError | |
+
+Returns:
+
+`void`
+
diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.fatalerror.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.fatalerror.md
new file mode 100644
index 0000000000000..4b764a6ede079
--- /dev/null
+++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.fatalerror.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) > [IEmbeddable](./kibana-plugin-plugins-embeddable-public.iembeddable.md) > [fatalError](./kibana-plugin-plugins-embeddable-public.iembeddable.fatalerror.md)
+
+## IEmbeddable.fatalError property
+
+If this embeddable has encountered a fatal error, that error will be stored here
+
+Signature:
+
+```typescript
+fatalError?: Error;
+```
diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.md
index b3b6f961e56d1..f96477ed65a04 100644
--- a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.md
+++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.md
@@ -15,6 +15,7 @@ export interface IEmbeddableobject | Extra abilities added to Embeddable by *_enhanced plugins. |
+| [fatalError](./kibana-plugin-plugins-embeddable-public.iembeddable.fatalerror.md) | Error | If this embeddable has encountered a fatal error, that error will be stored here |
| [id](./kibana-plugin-plugins-embeddable-public.iembeddable.id.md) | string | A unique identifier for this embeddable. Mainly only used by containers to map their Panel States to a child embeddable instance. |
| [isContainer](./kibana-plugin-plugins-embeddable-public.iembeddable.iscontainer.md) | boolean | Is this embeddable an instance of a Container class, can it contain nested embeddables? |
| [parent](./kibana-plugin-plugins-embeddable-public.iembeddable.parent.md) | IContainer | If this embeddable is nested inside a container, this will contain a reference to its parent. |
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executioncontext.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executioncontext.md
index 2a1a78b8fcb1a..86d24534f7a44 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executioncontext.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executioncontext.md
@@ -9,7 +9,7 @@
Signature:
```typescript
-export interface ExecutionContextExpressionFunctionCumulativeSum | |
| [derivative](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinitions.derivative.md) | ExpressionFunctionDerivative | |
| [font](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinitions.font.md) | ExpressionFunctionFont | |
-| [kibana\_context](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinitions.kibana_context.md) | ExpressionFunctionKibanaContext | |
-| [kibana](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinitions.kibana.md) | ExpressionFunctionKibana | |
| [moving\_average](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinitions.moving_average.md) | ExpressionFunctionMovingAverage | |
| [theme](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinitions.theme.md) | ExpressionFunctionTheme | |
| [var\_set](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinitions.var_set.md) | ExpressionFunctionVarSet | |
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctionkibana.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctionkibana.md
deleted file mode 100644
index 8ccf48ba28527..0000000000000
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctionkibana.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) > [ExpressionFunctionKibana](./kibana-plugin-plugins-expressions-public.expressionfunctionkibana.md)
-
-## ExpressionFunctionKibana type
-
-Signature:
-
-```typescript
-export declare type ExpressionFunctionKibana = ExpressionFunctionDefinition<'kibana', ExpressionValueSearchContext | null, object, ExpressionValueSearchContext>;
-```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md
index e2ad6215e25d0..2dfc67d2af5fa 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md
@@ -21,7 +21,7 @@ export interface IExpressionLoaderParams
| [disableCaching](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.disablecaching.md) | boolean | |
| [inspectorAdapters](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.inspectoradapters.md) | Adapters | |
| [onRenderError](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.onrendererror.md) | RenderErrorHandlerFnType | |
-| [searchContext](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.searchcontext.md) | ExecutionContextSearch | |
+| [searchContext](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.searchcontext.md) | SerializableState | |
| [searchSessionId](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.searchsessionid.md) | string | |
| [uiState](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.uistate.md) | unknown | |
| [variables](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.variables.md) | Record<string, any> | |
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.searchcontext.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.searchcontext.md
index 523d0c562f7ca..6b5fad950c4e9 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.searchcontext.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.searchcontext.md
@@ -7,5 +7,5 @@
Signature:
```typescript
-searchContext?: ExecutionContextSearch;
+searchContext?: SerializableState;
```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.kibana_context_name.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.kibana_context_name.md
deleted file mode 100644
index e568db84f383d..0000000000000
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.kibana_context_name.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) > [KIBANA\_CONTEXT\_NAME](./kibana-plugin-plugins-expressions-public.kibana_context_name.md)
-
-## KIBANA\_CONTEXT\_NAME type
-
-Signature:
-
-```typescript
-export declare type KIBANA_CONTEXT_NAME = 'kibana_context';
-```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.md
index db09f966e2fa5..a03ea32482011 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.md
@@ -99,7 +99,6 @@
| [ExpressionAstExpression](./kibana-plugin-plugins-expressions-public.expressionastexpression.md) | |
| [ExpressionAstFunction](./kibana-plugin-plugins-expressions-public.expressionastfunction.md) | |
| [ExpressionAstNode](./kibana-plugin-plugins-expressions-public.expressionastnode.md) | |
-| [ExpressionFunctionKibana](./kibana-plugin-plugins-expressions-public.expressionfunctionkibana.md) | |
| [ExpressionRendererComponent](./kibana-plugin-plugins-expressions-public.expressionrenderercomponent.md) | |
| [ExpressionsServiceSetup](./kibana-plugin-plugins-expressions-public.expressionsservicesetup.md) | The public contract that ExpressionsService provides to other plugins in Kibana Platform in \*setup\* life-cycle. |
| [ExpressionsSetup](./kibana-plugin-plugins-expressions-public.expressionssetup.md) | Expressions public setup contract, extends [ExpressionsServiceSetup](./kibana-plugin-plugins-expressions-public.expressionsservicesetup.md) |
@@ -110,13 +109,10 @@
| [ExpressionValueFilter](./kibana-plugin-plugins-expressions-public.expressionvaluefilter.md) | Represents an object that is a Filter. |
| [ExpressionValueNum](./kibana-plugin-plugins-expressions-public.expressionvaluenum.md) | |
| [ExpressionValueRender](./kibana-plugin-plugins-expressions-public.expressionvaluerender.md) | Represents an object that is intended to be rendered. |
-| [ExpressionValueSearchContext](./kibana-plugin-plugins-expressions-public.expressionvaluesearchcontext.md) | |
| [ExpressionValueUnboxed](./kibana-plugin-plugins-expressions-public.expressionvalueunboxed.md) | |
| [FontLabel](./kibana-plugin-plugins-expressions-public.fontlabel.md) | This type contains a unions of all supported font labels, or the the name of the font the user would see in a UI. |
| [FontValue](./kibana-plugin-plugins-expressions-public.fontvalue.md) | This type contains a union of all supported font values, equivalent to the CSS font-value property. |
| [InterpreterErrorType](./kibana-plugin-plugins-expressions-public.interpretererrortype.md) | |
-| [KIBANA\_CONTEXT\_NAME](./kibana-plugin-plugins-expressions-public.kibana_context_name.md) | |
-| [KibanaContext](./kibana-plugin-plugins-expressions-public.kibanacontext.md) | |
| [KnownTypeToString](./kibana-plugin-plugins-expressions-public.knowntypetostring.md) | Map the type of the generic to a string-based representation of the type.If the provided generic is its own type interface, we use the value of the type key as a string literal type for it. |
| [PointSeries](./kibana-plugin-plugins-expressions-public.pointseries.md) | A PointSeries is a unique structure that represents dots on a chart. |
| [PointSeriesColumnName](./kibana-plugin-plugins-expressions-public.pointseriescolumnname.md) | Allowed column names in a PointSeries |
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrenderer.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrenderer.md
index 32a7151578658..8cc32ff698b38 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrenderer.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrenderer.md
@@ -7,5 +7,5 @@
Signature:
```typescript
-ReactExpressionRenderer: ({ className, dataAttrs, padding, renderError, expression, onEvent, reload$, debounce, ...expressionLoaderOptions }: ReactExpressionRendererProps) => JSX.Element
+ReactExpressionRenderer: ({ className, dataAttrs, padding, renderError, expression, onEvent, onData$, reload$, debounce, ...expressionLoaderOptions }: ReactExpressionRendererProps) => JSX.Element
```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md
index e4980ce04b9e2..92ea071b23dfc 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md
@@ -18,6 +18,7 @@ export interface ReactExpressionRendererProps extends IExpressionLoaderParams
| [dataAttrs](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.dataattrs.md) | string[] | |
| [debounce](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.debounce.md) | number | |
| [expression](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.expression.md) | string | ExpressionAstExpression | |
+| [onData$](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.ondata_.md) | <TData, TInspectorAdapters>(data: TData, adapters?: TInspectorAdapters) => void | |
| [onEvent](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.onevent.md) | (event: ExpressionRendererEvent) => void | |
| [padding](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.padding.md) | 'xs' | 's' | 'm' | 'l' | 'xl' | |
| [reload$](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.reload_.md) | Observable<unknown> | An observable which can be used to re-run the expression without destroying the component |
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.ondata_.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.ondata_.md
new file mode 100644
index 0000000000000..05ddb0b13a5be
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.ondata_.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) > [ReactExpressionRendererProps](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md) > [onData$](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.ondata_.md)
+
+## ReactExpressionRendererProps.onData$ property
+
+Signature:
+
+```typescript
+onData$?: ExpressionFunctionCumulativeSum | |
| [derivative](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinitions.derivative.md) | ExpressionFunctionDerivative | |
| [font](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinitions.font.md) | ExpressionFunctionFont | |
-| [kibana\_context](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinitions.kibana_context.md) | ExpressionFunctionKibanaContext | |
-| [kibana](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinitions.kibana.md) | ExpressionFunctionKibana | |
| [moving\_average](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinitions.moving_average.md) | ExpressionFunctionMovingAverage | |
| [theme](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinitions.theme.md) | ExpressionFunctionTheme | |
| [var\_set](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinitions.var_set.md) | ExpressionFunctionVarSet | |
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunctionkibana.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunctionkibana.md
deleted file mode 100644
index aac2ae1c3ca4e..0000000000000
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunctionkibana.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) > [ExpressionFunctionKibana](./kibana-plugin-plugins-expressions-server.expressionfunctionkibana.md)
-
-## ExpressionFunctionKibana type
-
-Signature:
-
-```typescript
-export declare type ExpressionFunctionKibana = ExpressionFunctionDefinition<'kibana', ExpressionValueSearchContext | null, object, ExpressionValueSearchContext>;
-```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.kibana_context_name.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.kibana_context_name.md
deleted file mode 100644
index bd47c52e0d5ce..0000000000000
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.kibana_context_name.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) > [KIBANA\_CONTEXT\_NAME](./kibana-plugin-plugins-expressions-server.kibana_context_name.md)
-
-## KIBANA\_CONTEXT\_NAME type
-
-Signature:
-
-```typescript
-export declare type KIBANA_CONTEXT_NAME = 'kibana_context';
-```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.md
index 9e2189dad2732..5f7f373cd927f 100644
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.md
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.md
@@ -83,7 +83,6 @@
| [ExpressionAstExpression](./kibana-plugin-plugins-expressions-server.expressionastexpression.md) | |
| [ExpressionAstFunction](./kibana-plugin-plugins-expressions-server.expressionastfunction.md) | |
| [ExpressionAstNode](./kibana-plugin-plugins-expressions-server.expressionastnode.md) | |
-| [ExpressionFunctionKibana](./kibana-plugin-plugins-expressions-server.expressionfunctionkibana.md) | |
| [ExpressionsServerSetup](./kibana-plugin-plugins-expressions-server.expressionsserversetup.md) | |
| [ExpressionsServerStart](./kibana-plugin-plugins-expressions-server.expressionsserverstart.md) | |
| [ExpressionValue](./kibana-plugin-plugins-expressions-server.expressionvalue.md) | |
@@ -93,13 +92,10 @@
| [ExpressionValueFilter](./kibana-plugin-plugins-expressions-server.expressionvaluefilter.md) | Represents an object that is a Filter. |
| [ExpressionValueNum](./kibana-plugin-plugins-expressions-server.expressionvaluenum.md) | |
| [ExpressionValueRender](./kibana-plugin-plugins-expressions-server.expressionvaluerender.md) | Represents an object that is intended to be rendered. |
-| [ExpressionValueSearchContext](./kibana-plugin-plugins-expressions-server.expressionvaluesearchcontext.md) | |
| [ExpressionValueUnboxed](./kibana-plugin-plugins-expressions-server.expressionvalueunboxed.md) | |
| [FontLabel](./kibana-plugin-plugins-expressions-server.fontlabel.md) | This type contains a unions of all supported font labels, or the the name of the font the user would see in a UI. |
| [FontValue](./kibana-plugin-plugins-expressions-server.fontvalue.md) | This type contains a union of all supported font values, equivalent to the CSS font-value property. |
| [InterpreterErrorType](./kibana-plugin-plugins-expressions-server.interpretererrortype.md) | |
-| [KIBANA\_CONTEXT\_NAME](./kibana-plugin-plugins-expressions-server.kibana_context_name.md) | |
-| [KibanaContext](./kibana-plugin-plugins-expressions-server.kibanacontext.md) | |
| [KnownTypeToString](./kibana-plugin-plugins-expressions-server.knowntypetostring.md) | Map the type of the generic to a string-based representation of the type.If the provided generic is its own type interface, we use the value of the type key as a string literal type for it. |
| [PointSeries](./kibana-plugin-plugins-expressions-server.pointseries.md) | A PointSeries is a unique structure that represents dots on a chart. |
| [PointSeriesColumnName](./kibana-plugin-plugins-expressions-server.pointseriescolumnname.md) | Allowed column names in a PointSeries |
diff --git a/docs/development/plugins/ui_actions/public/kibana-plugin-plugins-ui_actions-public.uiactionsservice.addtriggeraction.md b/docs/development/plugins/ui_actions/public/kibana-plugin-plugins-ui_actions-public.uiactionsservice.addtriggeraction.md
index ba9060e01e57d..5a1ab83551d34 100644
--- a/docs/development/plugins/ui_actions/public/kibana-plugin-plugins-ui_actions-public.uiactionsservice.addtriggeraction.md
+++ b/docs/development/plugins/ui_actions/public/kibana-plugin-plugins-ui_actions-public.uiactionsservice.addtriggeraction.md
@@ -11,5 +11,5 @@
Signature:
```typescript
-readonly addTriggerAction: ActionRegistry | |
-| [addTriggerAction](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.addtriggeraction.md) | | <T extends "" | "SELECT_RANGE_TRIGGER" | "VALUE_CLICK_TRIGGER" | "FILTER_TRIGGER" | "VISUALIZE_FIELD_TRIGGER" | "VISUALIZE_GEO_FIELD_TRIGGER" | "CONTEXT_MENU_TRIGGER" | "PANEL_BADGE_TRIGGER" | "PANEL_NOTIFICATION_TRIGGER">(triggerId: T, action: ActionDefinition<TriggerContextMapping[T]> | Action<TriggerContextMapping[T], "" | "ACTION_VISUALIZE_FIELD" | "ACTION_VISUALIZE_GEO_FIELD" | "ACTION_VISUALIZE_LENS_FIELD" | "ACTION_CUSTOMIZE_PANEL" | "ACTION_ADD_PANEL" | "openInspector" | "deletePanel" | "editPanel" | "togglePanel" | "replacePanel" | "clonePanel" | "addToFromLibrary" | "unlinkFromLibrary" | "ACTION_LIBRARY_NOTIFICATION" | "ACTION_GLOBAL_APPLY_FILTER" | "ACTION_SELECT_RANGE" | "ACTION_VALUE_CLICK">) => void | addTriggerAction is similar to attachAction as it attaches action to a trigger, but it also registers the action, if it has not been registered, yet.addTriggerAction also infers better typing of the action argument. |
+| [addTriggerAction](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.addtriggeraction.md) | | <T extends "" | "SELECT_RANGE_TRIGGER" | "VALUE_CLICK_TRIGGER" | "FILTER_TRIGGER" | "VISUALIZE_FIELD_TRIGGER" | "VISUALIZE_GEO_FIELD_TRIGGER" | "CONTEXT_MENU_TRIGGER" | "PANEL_BADGE_TRIGGER" | "PANEL_NOTIFICATION_TRIGGER">(triggerId: T, action: ActionDefinition<TriggerContextMapping[T]> | Action<TriggerContextMapping[T], "" | "ACTION_VISUALIZE_FIELD" | "ACTION_VISUALIZE_GEO_FIELD" | "ACTION_VISUALIZE_LENS_FIELD" | "ACTION_GLOBAL_APPLY_FILTER" | "ACTION_SELECT_RANGE" | "ACTION_VALUE_CLICK" | "ACTION_CUSTOMIZE_PANEL" | "ACTION_ADD_PANEL" | "openInspector" | "deletePanel" | "editPanel" | "togglePanel" | "replacePanel" | "clonePanel" | "addToFromLibrary" | "unlinkFromLibrary" | "ACTION_LIBRARY_NOTIFICATION">) => void | addTriggerAction is similar to attachAction as it attaches action to a trigger, but it also registers the action, if it has not been registered, yet.addTriggerAction also infers better typing of the action argument. |
| [attachAction](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.attachaction.md) | | <T extends "" | "SELECT_RANGE_TRIGGER" | "VALUE_CLICK_TRIGGER" | "FILTER_TRIGGER" | "VISUALIZE_FIELD_TRIGGER" | "VISUALIZE_GEO_FIELD_TRIGGER" | "CONTEXT_MENU_TRIGGER" | "PANEL_BADGE_TRIGGER" | "PANEL_NOTIFICATION_TRIGGER">(triggerId: T, actionId: string) => void | |
| [clear](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.clear.md) | | () => void | Removes all registered triggers and actions. |
| [detachAction](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.detachaction.md) | | (triggerId: TriggerId, actionId: string) => void | |
| [executeTriggerActions](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.executetriggeractions.md) | | <T extends "" | "SELECT_RANGE_TRIGGER" | "VALUE_CLICK_TRIGGER" | "FILTER_TRIGGER" | "VISUALIZE_FIELD_TRIGGER" | "VISUALIZE_GEO_FIELD_TRIGGER" | "CONTEXT_MENU_TRIGGER" | "PANEL_BADGE_TRIGGER" | "PANEL_NOTIFICATION_TRIGGER">(triggerId: T, context: TriggerContext<T>) => Promise<void> | |
| [executionService](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.executionservice.md) | | UiActionsExecutionService | |
| [fork](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.fork.md) | | () => UiActionsService | "Fork" a separate instance of UiActionsService that inherits all existing triggers and actions, but going forward all new triggers and actions added to this instance of UiActionsService are only available within this instance. |
-| [getAction](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.getaction.md) | | <T extends ActionDefinition<{}>>(id: string) => Action<ActionContext<T>, "" | "ACTION_VISUALIZE_FIELD" | "ACTION_VISUALIZE_GEO_FIELD" | "ACTION_VISUALIZE_LENS_FIELD" | "ACTION_CUSTOMIZE_PANEL" | "ACTION_ADD_PANEL" | "openInspector" | "deletePanel" | "editPanel" | "togglePanel" | "replacePanel" | "clonePanel" | "addToFromLibrary" | "unlinkFromLibrary" | "ACTION_LIBRARY_NOTIFICATION" | "ACTION_GLOBAL_APPLY_FILTER" | "ACTION_SELECT_RANGE" | "ACTION_VALUE_CLICK"> | |
+| [getAction](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.getaction.md) | | <T extends ActionDefinition<{}>>(id: string) => Action<ActionContext<T>, "" | "ACTION_VISUALIZE_FIELD" | "ACTION_VISUALIZE_GEO_FIELD" | "ACTION_VISUALIZE_LENS_FIELD" | "ACTION_GLOBAL_APPLY_FILTER" | "ACTION_SELECT_RANGE" | "ACTION_VALUE_CLICK" | "ACTION_CUSTOMIZE_PANEL" | "ACTION_ADD_PANEL" | "openInspector" | "deletePanel" | "editPanel" | "togglePanel" | "replacePanel" | "clonePanel" | "addToFromLibrary" | "unlinkFromLibrary" | "ACTION_LIBRARY_NOTIFICATION"> | |
| [getTrigger](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.gettrigger.md) | | <T extends "" | "SELECT_RANGE_TRIGGER" | "VALUE_CLICK_TRIGGER" | "FILTER_TRIGGER" | "VISUALIZE_FIELD_TRIGGER" | "VISUALIZE_GEO_FIELD_TRIGGER" | "CONTEXT_MENU_TRIGGER" | "PANEL_BADGE_TRIGGER" | "PANEL_NOTIFICATION_TRIGGER">(triggerId: T) => TriggerContract<T> | |
-| [getTriggerActions](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.gettriggeractions.md) | | <T extends "" | "SELECT_RANGE_TRIGGER" | "VALUE_CLICK_TRIGGER" | "FILTER_TRIGGER" | "VISUALIZE_FIELD_TRIGGER" | "VISUALIZE_GEO_FIELD_TRIGGER" | "CONTEXT_MENU_TRIGGER" | "PANEL_BADGE_TRIGGER" | "PANEL_NOTIFICATION_TRIGGER">(triggerId: T) => Action<TriggerContextMapping[T], "" | "ACTION_VISUALIZE_FIELD" | "ACTION_VISUALIZE_GEO_FIELD" | "ACTION_VISUALIZE_LENS_FIELD" | "ACTION_CUSTOMIZE_PANEL" | "ACTION_ADD_PANEL" | "openInspector" | "deletePanel" | "editPanel" | "togglePanel" | "replacePanel" | "clonePanel" | "addToFromLibrary" | "unlinkFromLibrary" | "ACTION_LIBRARY_NOTIFICATION" | "ACTION_GLOBAL_APPLY_FILTER" | "ACTION_SELECT_RANGE" | "ACTION_VALUE_CLICK">[] | |
-| [getTriggerCompatibleActions](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.gettriggercompatibleactions.md) | | <T extends "" | "SELECT_RANGE_TRIGGER" | "VALUE_CLICK_TRIGGER" | "FILTER_TRIGGER" | "VISUALIZE_FIELD_TRIGGER" | "VISUALIZE_GEO_FIELD_TRIGGER" | "CONTEXT_MENU_TRIGGER" | "PANEL_BADGE_TRIGGER" | "PANEL_NOTIFICATION_TRIGGER">(triggerId: T, context: TriggerContextMapping[T]) => Promise<Action<TriggerContextMapping[T], "" | "ACTION_VISUALIZE_FIELD" | "ACTION_VISUALIZE_GEO_FIELD" | "ACTION_VISUALIZE_LENS_FIELD" | "ACTION_CUSTOMIZE_PANEL" | "ACTION_ADD_PANEL" | "openInspector" | "deletePanel" | "editPanel" | "togglePanel" | "replacePanel" | "clonePanel" | "addToFromLibrary" | "unlinkFromLibrary" | "ACTION_LIBRARY_NOTIFICATION" | "ACTION_GLOBAL_APPLY_FILTER" | "ACTION_SELECT_RANGE" | "ACTION_VALUE_CLICK">[]> | |
+| [getTriggerActions](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.gettriggeractions.md) | | <T extends "" | "SELECT_RANGE_TRIGGER" | "VALUE_CLICK_TRIGGER" | "FILTER_TRIGGER" | "VISUALIZE_FIELD_TRIGGER" | "VISUALIZE_GEO_FIELD_TRIGGER" | "CONTEXT_MENU_TRIGGER" | "PANEL_BADGE_TRIGGER" | "PANEL_NOTIFICATION_TRIGGER">(triggerId: T) => Action<TriggerContextMapping[T], "" | "ACTION_VISUALIZE_FIELD" | "ACTION_VISUALIZE_GEO_FIELD" | "ACTION_VISUALIZE_LENS_FIELD" | "ACTION_GLOBAL_APPLY_FILTER" | "ACTION_SELECT_RANGE" | "ACTION_VALUE_CLICK" | "ACTION_CUSTOMIZE_PANEL" | "ACTION_ADD_PANEL" | "openInspector" | "deletePanel" | "editPanel" | "togglePanel" | "replacePanel" | "clonePanel" | "addToFromLibrary" | "unlinkFromLibrary" | "ACTION_LIBRARY_NOTIFICATION">[] | |
+| [getTriggerCompatibleActions](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.gettriggercompatibleactions.md) | | <T extends "" | "SELECT_RANGE_TRIGGER" | "VALUE_CLICK_TRIGGER" | "FILTER_TRIGGER" | "VISUALIZE_FIELD_TRIGGER" | "VISUALIZE_GEO_FIELD_TRIGGER" | "CONTEXT_MENU_TRIGGER" | "PANEL_BADGE_TRIGGER" | "PANEL_NOTIFICATION_TRIGGER">(triggerId: T, context: TriggerContextMapping[T]) => Promise<Action<TriggerContextMapping[T], "" | "ACTION_VISUALIZE_FIELD" | "ACTION_VISUALIZE_GEO_FIELD" | "ACTION_VISUALIZE_LENS_FIELD" | "ACTION_GLOBAL_APPLY_FILTER" | "ACTION_SELECT_RANGE" | "ACTION_VALUE_CLICK" | "ACTION_CUSTOMIZE_PANEL" | "ACTION_ADD_PANEL" | "openInspector" | "deletePanel" | "editPanel" | "togglePanel" | "replacePanel" | "clonePanel" | "addToFromLibrary" | "unlinkFromLibrary" | "ACTION_LIBRARY_NOTIFICATION">[]> | |
| [hasAction](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.hasaction.md) | | (actionId: string) => boolean | |
-| [registerAction](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.registeraction.md) | | <A extends ActionDefinition<{}>>(definition: A) => Action<ActionContext<A>, "" | "ACTION_VISUALIZE_FIELD" | "ACTION_VISUALIZE_GEO_FIELD" | "ACTION_VISUALIZE_LENS_FIELD" | "ACTION_CUSTOMIZE_PANEL" | "ACTION_ADD_PANEL" | "openInspector" | "deletePanel" | "editPanel" | "togglePanel" | "replacePanel" | "clonePanel" | "addToFromLibrary" | "unlinkFromLibrary" | "ACTION_LIBRARY_NOTIFICATION" | "ACTION_GLOBAL_APPLY_FILTER" | "ACTION_SELECT_RANGE" | "ACTION_VALUE_CLICK"> | |
+| [registerAction](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.registeraction.md) | | <A extends ActionDefinition<{}>>(definition: A) => Action<ActionContext<A>, "" | "ACTION_VISUALIZE_FIELD" | "ACTION_VISUALIZE_GEO_FIELD" | "ACTION_VISUALIZE_LENS_FIELD" | "ACTION_GLOBAL_APPLY_FILTER" | "ACTION_SELECT_RANGE" | "ACTION_VALUE_CLICK" | "ACTION_CUSTOMIZE_PANEL" | "ACTION_ADD_PANEL" | "openInspector" | "deletePanel" | "editPanel" | "togglePanel" | "replacePanel" | "clonePanel" | "addToFromLibrary" | "unlinkFromLibrary" | "ACTION_LIBRARY_NOTIFICATION"> | |
| [registerTrigger](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.registertrigger.md) | | (trigger: Trigger) => void | |
| [triggers](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.triggers.md) | | TriggerRegistry | |
| [triggerToActions](./kibana-plugin-plugins-ui_actions-public.uiactionsservice.triggertoactions.md) | | TriggerToActionsRegistry | |
diff --git a/docs/development/plugins/ui_actions/public/kibana-plugin-plugins-ui_actions-public.uiactionsservice.registeraction.md b/docs/development/plugins/ui_actions/public/kibana-plugin-plugins-ui_actions-public.uiactionsservice.registeraction.md
index eeda7b503037d..bd340eb76fbac 100644
--- a/docs/development/plugins/ui_actions/public/kibana-plugin-plugins-ui_actions-public.uiactionsservice.registeraction.md
+++ b/docs/development/plugins/ui_actions/public/kibana-plugin-plugins-ui_actions-public.uiactionsservice.registeraction.md
@@ -7,5 +7,5 @@
Signature:
```typescript
-readonly registerAction: >(definition: A) => Action
- {children}
-
- );
- }
-}
diff --git a/packages/kbn-ui-framework/generator-kui/component/templates/index.js b/packages/kbn-ui-framework/generator-kui/component/templates/index.js
deleted file mode 100644
index 1da6deaa79d9a..0000000000000
--- a/packages/kbn-ui-framework/generator-kui/component/templates/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export {
- <%= componentName %>,
-} from './<%= fileName %>';
diff --git a/packages/kbn-ui-framework/generator-kui/component/templates/stateless_function.js b/packages/kbn-ui-framework/generator-kui/component/templates/stateless_function.js
deleted file mode 100644
index 7fcbf0c19d728..0000000000000
--- a/packages/kbn-ui-framework/generator-kui/component/templates/stateless_function.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-
-export const <%= componentName %> = ({
- children,
- className,
- ...rest
-}) => {
- const classes = classNames('<%= cssClassName %>', className);
-
- return (
-
- {children}
-
- );
-};
-
-<%= componentName %>.propTypes = {
- children: PropTypes.node,
- className: PropTypes.string,
-};
diff --git a/packages/kbn-ui-framework/generator-kui/component/templates/test.js b/packages/kbn-ui-framework/generator-kui/component/templates/test.js
deleted file mode 100644
index 4f384d6c2d3aa..0000000000000
--- a/packages/kbn-ui-framework/generator-kui/component/templates/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import { render } from 'enzyme';
-import { requiredProps } from '../../test/required_props';
-
-import { <%= componentName %> } from './<%= fileName %>';
-
-describe('<%= componentName %>', () => {
- test('is rendered', () => {
- const component = render(
- <<%= componentName %> {...requiredProps} />
- );
-
- expect(component)
- .toMatchSnapshot();
- });
-});
diff --git a/packages/kbn-ui-framework/generator-kui/documentation/index.js b/packages/kbn-ui-framework/generator-kui/documentation/index.js
deleted file mode 100644
index 03f8d5813b251..0000000000000
--- a/packages/kbn-ui-framework/generator-kui/documentation/index.js
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-const chalk = require('chalk');
-const { resolve } = require('path');
-const Generator = require('yeoman-generator');
-const utils = require('../utils');
-
-const DOCUMENTATION_PAGE_PATH = resolve(__dirname, '../../doc_site/src/views');
-
-module.exports = class extends Generator {
- constructor(args, options) {
- super(args, options);
-
- this.fileType = options.fileType;
- }
-
- prompting() {
- const prompts = [
- {
- message: "What's the name of the component you're documenting? Use snake_case, please.",
- name: 'name',
- type: 'input',
- store: true,
- },
- ];
-
- if (this.fileType === 'demo') {
- prompts.push({
- message: `What's the name of the directory this demo should go in? (Within ${DOCUMENTATION_PAGE_PATH}). Use snake_case, please.`,
- name: 'folderName',
- type: 'input',
- store: true,
- default: (answers) => answers.name,
- });
-
- prompts.push({
- message: 'What would you like to name this demo? Use snake_case, please.',
- name: 'demoName',
- type: 'input',
- store: true,
- });
- }
-
- return this.prompt(prompts).then((answers) => {
- this.config = answers;
- });
- }
-
- writing() {
- const config = this.config;
-
- const writeDocumentationPage = () => {
- const componentExampleName = utils.makeComponentName(config.name, false);
- const componentExamplePrefix = utils.lowerCaseFirstLetter(componentExampleName);
- const fileName = config.name;
-
- const path = DOCUMENTATION_PAGE_PATH;
-
- const vars = (config.documentationVars = {
- componentExampleName,
- componentExamplePrefix,
- fileName,
- });
-
- const documentationPagePath = (config.documentationPagePath = `${path}/${config.name}/${config.name}_example.js`);
-
- this.fs.copyTpl(
- this.templatePath('documentation_page.js'),
- this.destinationPath(documentationPagePath),
- vars
- );
- };
-
- const writeDocumentationPageDemo = (fileName, folderName) => {
- const componentExampleName = utils.makeComponentName(fileName, false);
- const componentExamplePrefix = utils.lowerCaseFirstLetter(componentExampleName);
- const componentName = utils.makeComponentName(config.name);
-
- const path = DOCUMENTATION_PAGE_PATH;
-
- const vars = (config.documentationVars = {
- componentExampleName,
- componentExamplePrefix,
- componentName,
- fileName,
- });
-
- const documentationPageDemoPath = (config.documentationPageDemoPath = `${path}/${folderName}/${fileName}.js`);
-
- this.fs.copyTpl(
- this.templatePath('documentation_page_demo.js'),
- this.destinationPath(documentationPageDemoPath),
- vars
- );
- };
-
- const writeSandbox = () => {
- const fileName = config.name;
- const componentExampleName = utils.makeComponentName(fileName, false);
-
- const path = DOCUMENTATION_PAGE_PATH;
-
- const vars = (config.documentationVars = {
- componentExampleName,
- fileName,
- });
-
- const sandboxPath = (config.documentationPageDemoPath = `${path}/${config.name}/${fileName}`);
-
- this.fs.copyTpl(
- this.templatePath('documentation_sandbox.html'),
- this.destinationPath(`${sandboxPath}_sandbox.html`)
- );
-
- this.fs.copyTpl(
- this.templatePath('documentation_sandbox.js'),
- this.destinationPath(`${sandboxPath}_sandbox.js`),
- vars
- );
- };
-
- switch (this.fileType) {
- case 'documentation':
- writeDocumentationPage();
- writeDocumentationPageDemo(config.name, config.name);
- break;
-
- case 'demo':
- writeDocumentationPageDemo(config.demoName, config.folderName);
- break;
-
- case 'sandbox':
- writeSandbox();
- break;
- }
- }
-
- end() {
- const showImportDemoSnippet = () => {
- const {
- componentExampleName,
- componentExamplePrefix,
- fileName,
- } = this.config.documentationVars;
-
- this.log(chalk.white('\n// Import demo into example.'));
- this.log(
- `${chalk.magenta('import')} ${componentExampleName} from ${chalk.cyan(
- `'./${fileName}'`
- )};\n` +
- `${chalk.magenta('const')} ${componentExamplePrefix}Source = require(${chalk.cyan(
- `'!!raw-loader!./${fileName}'`
- )});\n` +
- `${chalk.magenta(
- 'const'
- )} ${componentExamplePrefix}Html = renderToHtml(${componentExampleName});`
- );
-
- this.log(chalk.white('\n// Render demo.'));
- this.log(
- `Do whatever you want here!
diff --git a/packages/kbn-ui-framework/generator-kui/documentation/templates/documentation_sandbox.js b/packages/kbn-ui-framework/generator-kui/documentation/templates/documentation_sandbox.js deleted file mode 100644 index 6dd661601b891..0000000000000 --- a/packages/kbn-ui-framework/generator-kui/documentation/templates/documentation_sandbox.js +++ /dev/null @@ -1,27 +0,0 @@ -import React from 'react'; - -import { - GuideDemo, - GuideSandbox, - GuideSandboxCodeToggle, - GuideSectionTypes, -} from '../../components'; - -import html from './<%= fileName %>_sandbox.html'; - -export default props => ( -In the future, this algorithm could enable (2.6) "read-only functionality during the downtime window" but this is outside of the scope of this RFC.
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts index 6988a3211fa12..48187fe465392 100644 --- a/src/core/public/doc_links/doc_links_service.ts +++ b/src/core/public/doc_links/doc_links_service.ts @@ -37,6 +37,7 @@ export class DocLinksService { ELASTIC_WEBSITE_URL, links: { dashboard: { + guide: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/dashboard.html`, drilldowns: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/drilldowns.html`, drilldownsTriggerPicker: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/url-drilldown.html#trigger-picker`, urlDrilldownTemplateSyntax: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/url-drilldown.html#templating`, @@ -134,6 +135,8 @@ export class DocLinksService { visualize: { guide: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/visualize.html`, timelionDeprecation: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/dashboard.html#timelion-deprecation`, + lens: `${ELASTIC_WEBSITE_URL}what-is/kibana-lens`, + maps: `${ELASTIC_WEBSITE_URL}maps`, }, }, }); @@ -146,6 +149,7 @@ export interface DocLinksStart { readonly ELASTIC_WEBSITE_URL: string; readonly links: { readonly dashboard: { + readonly guide: string; readonly drilldowns: string; readonly drilldownsTriggerPicker: string; readonly urlDrilldownTemplateSyntax: string; diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md index fd2d943cab9d2..781a50f849e24 100644 --- a/src/core/public/public.api.md +++ b/src/core/public/public.api.md @@ -460,6 +460,7 @@ export interface DocLinksStart { // (undocumented) readonly links: { readonly dashboard: { + readonly guide: string; readonly drilldowns: string; readonly drilldownsTriggerPicker: string; readonly urlDrilldownTemplateSyntax: string; diff --git a/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts b/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts index 333f5caf72525..c35ec809fcf8d 100644 --- a/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts +++ b/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts @@ -21,28 +21,64 @@ import { esKuery } from '../../../es_query'; type KueryNode = any; -import { typeRegistryMock } from '../../../saved_objects_type_registry.mock'; -import { ALL_NAMESPACES_STRING } from '../utils'; +import { ALL_NAMESPACES_STRING, DEFAULT_NAMESPACE_STRING } from '../utils'; +import { SavedObjectTypeRegistry } from '../../../saved_objects_type_registry'; import { getQueryParams, getClauseForReference } from './query_params'; -const registry = typeRegistryMock.create(); +const registerTypes = (registry: SavedObjectTypeRegistry) => { + registry.registerType({ + name: 'pending', + hidden: false, + namespaceType: 'single', + mappings: { + properties: { title: { type: 'text' } }, + }, + management: { + defaultSearchField: 'title', + }, + }); -const MAPPINGS = { - properties: { - pending: { properties: { title: { type: 'text' } } }, - saved: { + registry.registerType({ + name: 'saved', + hidden: false, + namespaceType: 'single', + mappings: { properties: { title: { type: 'text', fields: { raw: { type: 'keyword' } } }, obj: { properties: { key1: { type: 'text' } } }, }, }, - // mock registry returns isMultiNamespace=true for 'shared' type - shared: { properties: { name: { type: 'keyword' } } }, - // mock registry returns isNamespaceAgnostic=true for 'global' type - global: { properties: { name: { type: 'keyword' } } }, - }, + management: { + defaultSearchField: 'title', + }, + }); + + registry.registerType({ + name: 'shared', + hidden: false, + namespaceType: 'multiple', + mappings: { + properties: { name: { type: 'keyword' } }, + }, + management: { + defaultSearchField: 'name', + }, + }); + + registry.registerType({ + name: 'global', + hidden: false, + namespaceType: 'agnostic', + mappings: { + properties: { name: { type: 'keyword' } }, + }, + management: { + defaultSearchField: 'name', + }, + }); }; -const ALL_TYPES = Object.keys(MAPPINGS.properties); + +const ALL_TYPES = ['pending', 'saved', 'shared', 'global']; // get all possible subsets (combination) of all types const ALL_TYPE_SUBSETS = ALL_TYPES.reduce( (subsets, value) => subsets.concat(subsets.map((set) => [...set, value])), @@ -51,48 +87,58 @@ const ALL_TYPE_SUBSETS = ALL_TYPES.reduce( .filter((x) => x.length) // exclude empty set .map((x) => (x.length === 1 ? x[0] : x)); // if a subset is a single string, destructure it -const createTypeClause = (type: string, namespaces?: string[]) => { - if (registry.isMultiNamespace(type)) { - const array = [...(namespaces ?? ['default']), ALL_NAMESPACES_STRING]; - return { - bool: { - must: expect.arrayContaining([{ terms: { namespaces: array } }]), - must_not: [{ exists: { field: 'namespace' } }], - }, - }; - } else if (registry.isSingleNamespace(type)) { - const nonDefaultNamespaces = namespaces?.filter((n) => n !== 'default') ?? []; - const should: any = []; - if (nonDefaultNamespaces.length > 0) { - should.push({ terms: { namespace: nonDefaultNamespaces } }); - } - if (namespaces?.includes('default')) { - should.push({ bool: { must_not: [{ exists: { field: 'namespace' } }] } }); - } - return { - bool: { - must: [{ term: { type } }], - should: expect.arrayContaining(should), - minimum_should_match: 1, - must_not: [{ exists: { field: 'namespaces' } }], - }, - }; - } - // isNamespaceAgnostic - return { - bool: expect.objectContaining({ - must_not: [{ exists: { field: 'namespace' } }, { exists: { field: 'namespaces' } }], - }), - }; -}; - /** * Note: these tests cases are defined in the order they appear in the source code, for readability's sake */ describe('#getQueryParams', () => { - const mappings = MAPPINGS; + let registry: SavedObjectTypeRegistry; type Result = ReturnType {
@@ -272,6 +273,8 @@ class DashboardGridUi extends React.Component {
}}
>
{
});
});
+ describe('getFormatterForField', () => {
+ test('should return the default one for empty objects', () => {
+ indexPattern.setFieldFormat('scriptedFieldWithEmptyFormatter', {});
+ expect(
+ indexPattern.getFormatterForField({
+ name: 'scriptedFieldWithEmptyFormatter',
+ type: 'number',
+ esTypes: ['long'],
+ })
+ ).toEqual(
+ expect.objectContaining({
+ convert: expect.any(Function),
+ getConverterFor: expect.any(Function),
+ })
+ );
+ });
+ });
+
describe('toSpec', () => {
test('should match snapshot', () => {
const formatter = {
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 1cb54ef12a4c1..eac5cebd1522a 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
@@ -18,7 +18,7 @@
*/
import _, { each, reject } from 'lodash';
-import { IndexPatternAttrs } from '../..';
+import { FieldAttrs } from '../..';
import { DuplicateField } from '../../../../kibana_utils/common';
import { ES_FIELD_TYPES, KBN_FIELD_TYPES, IIndexPattern, IFieldType } from '../../../common';
@@ -37,7 +37,7 @@ interface IndexPatternDeps {
}
interface SavedObjectBody {
- attributes?: IndexPatternAttrs;
+ fieldAttrs?: string;
title?: string;
timeFieldName?: string;
intervalName?: string;
@@ -72,6 +72,8 @@ export class IndexPattern implements IIndexPattern {
private originalSavedObjectBody: SavedObjectBody = {};
private shortDotsEnable: boolean = false;
private fieldFormats: FieldFormatsStartCommon;
+ // make private once manual field refresh is removed
+ public fieldAttrs: FieldAttrs;
constructor({
spec = {},
@@ -106,6 +108,7 @@ export class IndexPattern implements IIndexPattern {
this.fields.replaceAll(Object.values(spec.fields || {}));
this.type = spec.type;
this.typeMeta = spec.typeMeta;
+ this.fieldAttrs = spec.fieldAttrs || {};
}
setFieldFormat = (fieldName: string, format: SerializedFieldFormat) => {
@@ -128,6 +131,20 @@ export class IndexPattern implements IIndexPattern {
this.originalSavedObjectBody = this.getAsSavedObjectBody();
};
+ getFieldAttrs = () => {
+ const newFieldAttrs = { ...this.fieldAttrs };
+
+ this.fields.forEach((field) => {
+ if (field.customName) {
+ newFieldAttrs[field.name] = { customName: field.customName };
+ } else {
+ delete newFieldAttrs[field.name];
+ }
+ });
+
+ return newFieldAttrs;
+ };
+
getComputedFields() {
const scriptFields: any = {};
if (!this.fields) {
@@ -181,6 +198,7 @@ export class IndexPattern implements IIndexPattern {
typeMeta: this.typeMeta,
type: this.type,
fieldFormats: this.fieldFormatMap,
+ fieldAttrs: this.fieldAttrs,
};
}
@@ -272,9 +290,10 @@ export class IndexPattern implements IIndexPattern {
const fieldFormatMap = _.isEmpty(this.fieldFormatMap)
? undefined
: JSON.stringify(this.fieldFormatMap);
+ const fieldAttrs = this.getFieldAttrs();
return {
- attributes: this.getSavedObjectAttrsField(),
+ fieldAttrs: fieldAttrs ? JSON.stringify(fieldAttrs) : undefined,
title: this.title,
timeFieldName: this.timeFieldName,
intervalName: this.intervalName,
@@ -293,15 +312,15 @@ export class IndexPattern implements IIndexPattern {
getFormatterForField(
field: IndexPatternField | IndexPatternField['spec'] | IFieldType
): FieldFormat {
- const formatSpec = this.fieldFormatMap[field.name];
- if (formatSpec) {
- return this.fieldFormats.getInstance(formatSpec.id, formatSpec.params);
- } else {
- return this.fieldFormats.getDefaultInstance(
- field.type as KBN_FIELD_TYPES,
- field.esTypes as ES_FIELD_TYPES[]
- );
+ const fieldFormat = this.getFormatterForFieldNoDefault(field.name);
+ if (fieldFormat) {
+ return fieldFormat;
}
+
+ return this.fieldFormats.getDefaultInstance(
+ field.type as KBN_FIELD_TYPES,
+ field.esTypes as ES_FIELD_TYPES[]
+ );
}
/**
@@ -310,25 +329,10 @@ export class IndexPattern implements IIndexPattern {
*/
getFormatterForFieldNoDefault(fieldname: string) {
const formatSpec = this.fieldFormatMap[fieldname];
- if (formatSpec) {
+ if (formatSpec?.id) {
return this.fieldFormats.getInstance(formatSpec.id, formatSpec.params);
}
}
-
- /**
- * Creates saved object attributes field.
- */
- private getSavedObjectAttrsField() {
- const fieldAttrs = this.fields.reduce((collector, { name, customName }) => {
- if (customName) {
- collector[name] = {
- customName,
- };
- }
- return collector;
- }, {} as IndexPatternAttrs['fields']);
- return Object.keys(fieldAttrs).length ? { fields: fieldAttrs } : undefined;
- }
/**
* Helper function to extend field specs with e.g. customName
*/
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 81e48d5ccf6fc..a99c2fdfa12ec 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -35,7 +35,7 @@ import {
GetFieldsOptions,
IndexPatternSpec,
IndexPatternAttributes,
- IndexPatternAttrsFields,
+ FieldAttrs,
FieldSpec,
IndexPatternFieldMap,
} from '../types';
@@ -99,11 +99,12 @@ export class IndexPatternsService {
* Refresh cache of index pattern ids and titles
*/
private async refreshSavedObjectsCache() {
- this.savedObjectsCache = await this.savedObjectsClient.find({
+ const so = await this.savedObjectsClient.find({
type: 'index-pattern',
fields: ['title'],
perPage: 10000,
});
+ this.savedObjectsCache = so;
}
/**
@@ -216,13 +217,13 @@ export class IndexPatternsService {
* Get field list by providing { pattern }
* @param options
*/
- getFieldsForWildcard = async (options: GetFieldsOptions = {}) => {
+ getFieldsForWildcard = async (options: GetFieldsOptions) => {
const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
return this.apiClient.getFieldsForWildcard({
pattern: options.pattern,
metaFields,
type: options.type,
- params: options.params || {},
+ rollupIndex: options.rollupIndex,
});
};
@@ -232,13 +233,13 @@ export class IndexPatternsService {
*/
getFieldsForIndexPattern = async (
indexPattern: IndexPattern | IndexPatternSpec,
- options: GetFieldsOptions = {}
+ options?: GetFieldsOptions
) =>
this.getFieldsForWildcard({
- pattern: indexPattern.title as string,
- ...options,
type: indexPattern.type,
- params: indexPattern.typeMeta && indexPattern.typeMeta.params,
+ rollupIndex: indexPattern?.typeMeta?.params?.rollup_index,
+ ...options,
+ pattern: indexPattern.title as string,
});
/**
@@ -249,7 +250,9 @@ export class IndexPatternsService {
try {
const fields = await this.getFieldsForIndexPattern(indexPattern);
const scripted = indexPattern.getScriptedFields().map((field) => field.spec);
- indexPattern.fields.replaceAll([...fields, ...scripted]);
+ const fieldAttrs = indexPattern.getFieldAttrs();
+ const fieldsWithSavedAttrs = Object.values(this.fieldArrayToMap(fields, fieldAttrs));
+ indexPattern.fields.replaceAll([...fieldsWithSavedAttrs, ...scripted]);
} catch (err) {
if (err instanceof IndexPatternMissingIndices) {
this.onNotification({ title: (err as any).message, color: 'danger', iconType: 'alert' });
@@ -275,12 +278,13 @@ export class IndexPatternsService {
fields: IndexPatternFieldMap,
id: string,
title: string,
- options: GetFieldsOptions
+ options: GetFieldsOptions,
+ fieldAttrs: FieldAttrs = {}
) => {
const scriptdFields = Object.values(fields).filter((field) => field.scripted);
try {
- const newFields = await this.getFieldsForWildcard(options);
- return this.fieldArrayToMap([...newFields, ...scriptdFields]);
+ const newFields = (await this.getFieldsForWildcard(options)) as FieldSpec[];
+ return this.fieldArrayToMap([...newFields, ...scriptdFields], fieldAttrs);
} catch (err) {
if (err instanceof IndexPatternMissingIndices) {
this.onNotification({ title: (err as any).message, color: 'danger', iconType: 'alert' });
@@ -301,7 +305,7 @@ export class IndexPatternsService {
* Converts field array to map
* @param fields
*/
- fieldArrayToMap = (fields: FieldSpec[], fieldAttrs?: IndexPatternAttrsFields) =>
+ fieldArrayToMap = (fields: FieldSpec[], fieldAttrs?: FieldAttrs) =>
fields.reduce((collector, field) => {
collector[field.name] = { ...field, customName: fieldAttrs?.[field.name]?.customName };
return collector;
@@ -325,7 +329,7 @@ export class IndexPatternsService {
fieldFormatMap,
typeMeta,
type,
- attributes,
+ fieldAttrs,
},
} = savedObject;
@@ -333,6 +337,7 @@ export class IndexPatternsService {
const parsedTypeMeta = typeMeta ? JSON.parse(typeMeta) : undefined;
const parsedFieldFormatMap = fieldFormatMap ? JSON.parse(fieldFormatMap) : {};
const parsedFields: FieldSpec[] = fields ? JSON.parse(fields) : [];
+ const parsedFieldAttrs: FieldAttrs = fieldAttrs ? JSON.parse(fieldAttrs) : {};
return {
id,
@@ -341,10 +346,11 @@ export class IndexPatternsService {
intervalName,
timeFieldName,
sourceFilters: parsedSourceFilters,
- fields: this.fieldArrayToMap(parsedFields, attributes?.fields),
+ fields: this.fieldArrayToMap(parsedFields, parsedFieldAttrs),
typeMeta: parsedTypeMeta,
type,
fieldFormats: parsedFieldFormatMap,
+ fieldAttrs: parsedFieldAttrs,
};
};
@@ -370,17 +376,26 @@ export class IndexPatternsService {
const spec = this.savedObjectToSpec(savedObject);
const { title, type, typeMeta } = spec;
+ spec.fieldAttrs = savedObject.attributes.fieldAttrs
+ ? JSON.parse(savedObject.attributes.fieldAttrs)
+ : {};
const isFieldRefreshRequired = this.isFieldRefreshRequired(spec.fields);
let isSaveRequired = isFieldRefreshRequired;
try {
spec.fields = isFieldRefreshRequired
- ? await this.refreshFieldSpecMap(spec.fields || {}, id, spec.title as string, {
- pattern: title,
- metaFields: await this.config.get(UI_SETTINGS.META_FIELDS),
- type,
- params: typeMeta && typeMeta.params,
- })
+ ? await this.refreshFieldSpecMap(
+ spec.fields || {},
+ id,
+ spec.title as string,
+ {
+ pattern: title as string,
+ metaFields: await this.config.get(UI_SETTINGS.META_FIELDS),
+ type,
+ rollupIndex: typeMeta?.params?.rollupIndex,
+ },
+ spec.fieldAttrs
+ )
: spec.fields;
} catch (err) {
isSaveRequired = false;
@@ -403,7 +418,6 @@ export class IndexPatternsService {
spec.fieldFormats = savedObject.attributes.fieldFormatMap
? JSON.parse(savedObject.attributes.fieldFormatMap)
: {};
- spec.attributes = savedObject.attributes.attributes;
const indexPattern = await this.create(spec, true);
indexPatternCache.set(id, indexPattern);
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index 94da87fc16def..22c400562f6d4 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -48,18 +48,10 @@ export interface IndexPatternAttributes {
intervalName?: string;
sourceFilters?: string;
fieldFormatMap?: string;
- attributes?: IndexPatternAttrs;
+ fieldAttrs?: string;
}
-/**
- * Generic location for IndexPattern class attributes from saved object
- */
-
-export interface IndexPatternAttrs {
- fields: IndexPatternAttrsFields;
-}
-
-export interface IndexPatternAttrsFields {
+export interface FieldAttrs {
[key: string]: { customName: string };
}
@@ -99,15 +91,22 @@ export interface SavedObjectsClientCommon {
}
export interface GetFieldsOptions {
- pattern?: string;
+ pattern: string;
type?: string;
- params?: any;
lookBack?: boolean;
metaFields?: string[];
+ rollupIndex?: string;
+}
+
+export interface GetFieldsOptionsTimePattern {
+ pattern: string;
+ metaFields: string[];
+ lookBack: number;
+ interval: string;
}
export interface IIndexPatternsApiClient {
- getFieldsForTimePattern: (options: GetFieldsOptions) => Promise;
+ getFieldsForTimePattern: (options: GetFieldsOptionsTimePattern) => Promise;
getFieldsForWildcard: (options: GetFieldsOptions) => Promise;
}
@@ -144,7 +143,6 @@ export interface FieldSpecExportFmt {
lang?: string;
conflictDescriptions?: FieldSpecConflictDescriptions;
name: string;
- customLabel?: string;
type: KBN_FIELD_TYPES;
esTypes?: string[];
scripted: boolean;
@@ -189,7 +187,7 @@ export interface IndexPatternSpec {
typeMeta?: TypeMeta;
type?: string;
fieldFormats?: Record;
- attributes?: IndexPatternAttrs;
+ fieldAttrs?: FieldAttrs;
}
export interface SourceFilter {
diff --git a/src/plugins/data/common/search/aggs/types.ts b/src/plugins/data/common/search/aggs/types.ts
index 09a13762d4d70..897b60e91b100 100644
--- a/src/plugins/data/common/search/aggs/types.ts
+++ b/src/plugins/data/common/search/aggs/types.ts
@@ -94,7 +94,7 @@ export interface AggsCommonStart {
*/
getDateMetaByDatatableColumn: (
column: DatatableColumn
- ) => Promise;
+ ) => Promise;
createAggConfigs: (
indexPattern: IndexPattern,
configStates?: CreateAggConfigParams[],
diff --git a/src/plugins/data/common/search/aggs/utils/time_column_meta.test.ts b/src/plugins/data/common/search/aggs/utils/time_column_meta.test.ts
index e56d622734554..8eb076f5b7906 100644
--- a/src/plugins/data/common/search/aggs/utils/time_column_meta.test.ts
+++ b/src/plugins/data/common/search/aggs/utils/time_column_meta.test.ts
@@ -91,6 +91,43 @@ describe('getDateMetaByDatatableColumn', () => {
});
});
+ it('throws if unable to resolve interval', async () => {
+ await expect(
+ getDateMetaByDatatableColumn(params)({
+ id: 'test',
+ name: 'test',
+ meta: {
+ type: 'date',
+ source: 'esaggs',
+ sourceParams: {
+ type: BUCKET_TYPES.DATE_HISTOGRAM,
+ params: {
+ time_zone: 'UTC',
+ interval: 'auto',
+ },
+ },
+ },
+ })
+ ).rejects.toBeDefined();
+
+ await expect(
+ getDateMetaByDatatableColumn(params)({
+ id: 'test',
+ name: 'test',
+ meta: {
+ type: 'date',
+ source: 'esaggs',
+ sourceParams: {
+ type: BUCKET_TYPES.DATE_HISTOGRAM,
+ params: {
+ time_zone: 'UTC',
+ },
+ },
+ },
+ })
+ ).rejects.toBeDefined();
+ });
+
it('returns resolved auto interval', async () => {
expect(
await getDateMetaByDatatableColumn(params)({
@@ -106,8 +143,8 @@ describe('getDateMetaByDatatableColumn', () => {
interval: 'auto',
},
appliedTimeRange: {
- from: 'now-5d',
- to: 'now',
+ from: '2020-10-05T00:00:00.000Z',
+ to: '2020-10-10T00:00:00.000Z',
},
},
},
diff --git a/src/plugins/data/common/search/aggs/utils/time_column_meta.ts b/src/plugins/data/common/search/aggs/utils/time_column_meta.ts
index 1bea716c6a049..7ed8cb79f63f4 100644
--- a/src/plugins/data/common/search/aggs/utils/time_column_meta.ts
+++ b/src/plugins/data/common/search/aggs/utils/time_column_meta.ts
@@ -38,11 +38,11 @@ export const getDateMetaByDatatableColumn = ({
getConfig,
}: DateMetaByColumnDeps) => async (
column: DatatableColumn
-): Promise => {
+): Promise => {
if (column.meta.source !== 'esaggs') return;
if (column.meta.sourceParams?.type !== BUCKET_TYPES.DATE_HISTOGRAM) return;
const params = column.meta.sourceParams.params as AggParamsDateHistogram;
- const appliedTimeRange = column.meta.sourceParams.appliedTimeRange as TimeRange;
+ const appliedTimeRange = column.meta.sourceParams.appliedTimeRange as TimeRange | undefined;
const tz = inferTimeZone(
params,
@@ -52,9 +52,11 @@ export const getDateMetaByDatatableColumn = ({
);
const interval =
- params.interval === 'auto' ? calculateAutoTimeExpression(appliedTimeRange) : params.interval;
+ params.interval === 'auto' && appliedTimeRange
+ ? calculateAutoTimeExpression(appliedTimeRange)
+ : params.interval;
- if (!interval) {
+ if (!interval || interval === 'auto') {
throw new Error('time interval could not be determined');
}
diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/__snapshots__/kibana.test.ts.snap b/src/plugins/data/common/search/expressions/__snapshots__/kibana.test.ts.snap
similarity index 100%
rename from src/plugins/expressions/common/expression_functions/specs/tests/__snapshots__/kibana.test.ts.snap
rename to src/plugins/data/common/search/expressions/__snapshots__/kibana.test.ts.snap
diff --git a/src/plugins/data/common/search/expressions/esaggs.ts b/src/plugins/data/common/search/expressions/esaggs.ts
index 4f65babdcd360..47d97a81a67b1 100644
--- a/src/plugins/data/common/search/expressions/esaggs.ts
+++ b/src/plugins/data/common/search/expressions/esaggs.ts
@@ -17,11 +17,8 @@
* under the License.
*/
-import {
- KibanaContext,
- Datatable,
- ExpressionFunctionDefinition,
-} from '../../../../../plugins/expressions/common';
+import { Datatable, ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { KibanaContext } from './kibana_context_type';
type Input = KibanaContext | null;
type Output = Promise;
diff --git a/src/plugins/data/common/search/expressions/index.ts b/src/plugins/data/common/search/expressions/index.ts
index 25839a805d8c5..28d892d091956 100644
--- a/src/plugins/data/common/search/expressions/index.ts
+++ b/src/plugins/data/common/search/expressions/index.ts
@@ -17,5 +17,8 @@
* under the License.
*/
+export * from './kibana';
+export * from './kibana_context';
+export * from './kibana_context_type';
export * from './esaggs';
export * from './utils';
diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/kibana.test.ts b/src/plugins/data/common/search/expressions/kibana.test.ts
similarity index 92%
rename from src/plugins/expressions/common/expression_functions/specs/tests/kibana.test.ts
rename to src/plugins/data/common/search/expressions/kibana.test.ts
index e5c4b92de4fdb..58fee1ee1f6a6 100644
--- a/src/plugins/expressions/common/expression_functions/specs/tests/kibana.test.ts
+++ b/src/plugins/data/common/search/expressions/kibana.test.ts
@@ -17,14 +17,14 @@
* under the License.
*/
+import { ExecutionContext } from 'src/plugins/expressions/common';
+import { kibana } from './kibana';
+import { ExpressionValueSearchContext } from './kibana_context_type';
import { functionWrapper } from './utils';
-import { kibana } from '../kibana';
-import { ExecutionContext } from '../../../execution/types';
-import { KibanaContext, ExpressionValueSearchContext } from '../../../expression_types';
describe('interpreter/functions#kibana', () => {
const fn = functionWrapper(kibana);
- let input: Partial;
+ let input: Partial;
let search: ExpressionValueSearchContext;
let context: ExecutionContext;
diff --git a/src/plugins/expressions/common/expression_functions/specs/kibana.ts b/src/plugins/data/common/search/expressions/kibana.ts
similarity index 82%
rename from src/plugins/expressions/common/expression_functions/specs/kibana.ts
rename to src/plugins/data/common/search/expressions/kibana.ts
index 3ec4c23eab28d..c31219284760a 100644
--- a/src/plugins/expressions/common/expression_functions/specs/kibana.ts
+++ b/src/plugins/data/common/search/expressions/kibana.ts
@@ -18,8 +18,9 @@
*/
import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from '../types';
-import { ExpressionValueSearchContext } from '../../expression_types';
+import { ExecutionContext, ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { Adapters } from 'src/plugins/inspector/common';
+import { ExpressionValueSearchContext, ExecutionContextSearch } from './kibana_context_type';
const toArray = (query: undefined | T | T[]): T[] =>
!query ? [] : Array.isArray(query) ? query : [query];
@@ -29,7 +30,8 @@ export type ExpressionFunctionKibana = ExpressionFunctionDefinition<
// TODO: Get rid of the `null` type below.
ExpressionValueSearchContext | null,
object,
- ExpressionValueSearchContext
+ ExpressionValueSearchContext,
+ ExecutionContext
>;
export const kibana: ExpressionFunctionKibana = {
@@ -38,7 +40,7 @@ export const kibana: ExpressionFunctionKibana = {
inputTypes: ['kibana_context', 'null'],
- help: i18n.translate('expressions.functions.kibana.help', {
+ help: i18n.translate('data.search.functions.kibana.help', {
defaultMessage: 'Gets kibana global context',
}),
diff --git a/src/plugins/expressions/common/expression_functions/specs/kibana_context.ts b/src/plugins/data/common/search/expressions/kibana_context.ts
similarity index 84%
rename from src/plugins/expressions/common/expression_functions/specs/kibana_context.ts
rename to src/plugins/data/common/search/expressions/kibana_context.ts
index 2b7d1b8ed9d76..7bf14ff02316e 100644
--- a/src/plugins/expressions/common/expression_functions/specs/kibana_context.ts
+++ b/src/plugins/data/common/search/expressions/kibana_context.ts
@@ -16,11 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
+
import { uniqBy } from 'lodash';
import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from '../../expression_functions';
-import { KibanaContext } from '../../expression_types';
-import { Query, uniqFilters } from '../../../../data/common';
+import { ExpressionFunctionDefinition, ExecutionContext } from 'src/plugins/expressions/common';
+import { Adapters } from 'src/plugins/inspector/common';
+import { Query, uniqFilters } from '../../query';
+import { ExecutionContextSearch, KibanaContext } from './kibana_context_type';
interface Arguments {
q?: string | null;
@@ -33,7 +35,8 @@ export type ExpressionFunctionKibanaContext = ExpressionFunctionDefinition<
'kibana_context',
KibanaContext | null,
Arguments,
- Promise
+ Promise,
+ ExecutionContext
>;
const getParsedValue = (data: any, defaultValue: any) =>
@@ -49,7 +52,7 @@ export const kibanaContextFunction: ExpressionFunctionKibanaContext = {
name: 'kibana_context',
type: 'kibana_context',
inputTypes: ['kibana_context', 'null'],
- help: i18n.translate('expressions.functions.kibana_context.help', {
+ help: i18n.translate('data.search.functions.kibana_context.help', {
defaultMessage: 'Updates kibana global context',
}),
args: {
@@ -57,28 +60,28 @@ export const kibanaContextFunction: ExpressionFunctionKibanaContext = {
types: ['string', 'null'],
aliases: ['query', '_'],
default: null,
- help: i18n.translate('expressions.functions.kibana_context.q.help', {
+ help: i18n.translate('data.search.functions.kibana_context.q.help', {
defaultMessage: 'Specify Kibana free form text query',
}),
},
filters: {
types: ['string', 'null'],
default: '"[]"',
- help: i18n.translate('expressions.functions.kibana_context.filters.help', {
+ help: i18n.translate('data.search.functions.kibana_context.filters.help', {
defaultMessage: 'Specify Kibana generic filters',
}),
},
timeRange: {
types: ['string', 'null'],
default: null,
- help: i18n.translate('expressions.functions.kibana_context.timeRange.help', {
+ help: i18n.translate('data.search.functions.kibana_context.timeRange.help', {
defaultMessage: 'Specify Kibana time range filter',
}),
},
savedSearchId: {
types: ['string', 'null'],
default: null,
- help: i18n.translate('expressions.functions.kibana_context.savedSearchId.help', {
+ help: i18n.translate('data.search.functions.kibana_context.savedSearchId.help', {
defaultMessage: 'Specify saved search ID to be used for queries and filters',
}),
},
diff --git a/src/plugins/expressions/common/expression_types/specs/kibana_context.ts b/src/plugins/data/common/search/expressions/kibana_context_type.ts
similarity index 79%
rename from src/plugins/expressions/common/expression_types/specs/kibana_context.ts
rename to src/plugins/data/common/search/expressions/kibana_context_type.ts
index 3af7b990429c0..a5b459a607991 100644
--- a/src/plugins/expressions/common/expression_types/specs/kibana_context.ts
+++ b/src/plugins/data/common/search/expressions/kibana_context_type.ts
@@ -17,8 +17,16 @@
* under the License.
*/
-import { ExpressionValueBoxed } from '../types';
-import { ExecutionContextSearch } from '../../execution/types';
+import { ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { Filter } from '../../es_query';
+import { Query, TimeRange } from '../../query';
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type ExecutionContextSearch = {
+ filters?: Filter[];
+ query?: Query | Query[];
+ timeRange?: TimeRange;
+};
export type ExpressionValueSearchContext = ExpressionValueBoxed<
'kibana_context',
diff --git a/src/plugins/visualizations/public/wizard/type_selection/vis_type_icon.tsx b/src/plugins/data/common/search/expressions/utils/function_wrapper.ts
similarity index 55%
rename from src/plugins/visualizations/public/wizard/type_selection/vis_type_icon.tsx
rename to src/plugins/data/common/search/expressions/utils/function_wrapper.ts
index a9837313f2917..b5e45d9ca1de0 100644
--- a/src/plugins/visualizations/public/wizard/type_selection/vis_type_icon.tsx
+++ b/src/plugins/data/common/search/expressions/utils/function_wrapper.ts
@@ -17,25 +17,18 @@
* under the License.
*/
-import { EuiIcon, IconType } from '@elastic/eui';
-import React from 'react';
-
-interface VisTypeIconProps {
- icon?: IconType;
- image?: string;
-}
+import { mapValues } from 'lodash';
+import { AnyExpressionFunctionDefinition, ExecutionContext } from 'src/plugins/expressions/common';
/**
- * This renders the icon for a specific visualization type.
- * This currently checks the following:
- * - If image is set, use that as the `src` of an image
- * - Otherwise use the icon as an EuiIcon or the 'empty' icon if that's not set
+ * Takes a function spec and passes in default args,
+ * overriding with any provided args.
*/
-export const VisTypeIcon = ({ icon, image }: VisTypeIconProps) => {
+export const functionWrapper = (spec: AnyExpressionFunctionDefinition) => {
+ const defaultArgs = mapValues(spec.args, (argSpec) => argSpec.default);
return (
-
- {image && 
}
- {!image &&
- );
+ context: object | null,
+ args: Record = {},
+ handlers: ExecutionContext = {} as ExecutionContext
+ ) => spec.fn(context, { ...defaultArgs, ...args }, handlers);
};
diff --git a/src/plugins/data/common/search/expressions/utils/index.ts b/src/plugins/data/common/search/expressions/utils/index.ts
index 75c1809770c78..39f88b0f13fee 100644
--- a/src/plugins/data/common/search/expressions/utils/index.ts
+++ b/src/plugins/data/common/search/expressions/utils/index.ts
@@ -18,3 +18,4 @@
*/
export * from './courier_inspector_stats';
+export * from './function_wrapper';
diff --git a/src/plugins/data/common/utils/index.ts b/src/plugins/data/common/utils/index.ts
index 33989f3ad50a7..8b8686c51b9c1 100644
--- a/src/plugins/data/common/utils/index.ts
+++ b/src/plugins/data/common/utils/index.ts
@@ -19,4 +19,3 @@
/** @internal */
export { shortenDottedString } from './shorten_dotted_string';
-export { AbortError, toPromise, getCombinedSignal } from './abort_utils';
diff --git a/src/plugins/data/kibana.json b/src/plugins/data/kibana.json
index 9cb9b1745373a..d6f2534bd5e3b 100644
--- a/src/plugins/data/kibana.json
+++ b/src/plugins/data/kibana.json
@@ -8,7 +8,7 @@
"uiActions"
],
"optionalPlugins": ["usageCollection"],
- "extraPublicDirs": ["common", "common/utils/abort_utils"],
+ "extraPublicDirs": ["common"],
"requiredBundles": [
"usageCollection",
"kibanaUtils",
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index ce020a9742399..129addf3de70e 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -338,6 +338,12 @@ export {
OptionedParamType,
OptionedValueProp,
ParsedInterval,
+ // expressions
+ ExecutionContextSearch,
+ ExpressionFunctionKibana,
+ ExpressionFunctionKibanaContext,
+ ExpressionValueSearchContext,
+ KibanaContext,
// tabify
TabbedAggColumn,
TabbedAggRow,
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.ts b/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.ts
index 37ee80c2c29e4..8c48ee44fba9c 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.ts
@@ -32,7 +32,12 @@ describe('IndexPatternsApiClient', () => {
test('uses the right URI to fetch fields for time patterns', async function () {
const expectedPath = '/api/index_patterns/_fields_for_time_pattern';
- await indexPatternsApiClient.getFieldsForTimePattern();
+ await indexPatternsApiClient.getFieldsForTimePattern({
+ pattern: 'blah',
+ metaFields: [],
+ lookBack: 5,
+ interval: '',
+ });
expect(fetchSpy).toHaveBeenCalledWith(expectedPath, expect.any(Object));
});
@@ -40,15 +45,7 @@ describe('IndexPatternsApiClient', () => {
test('uses the right URI to fetch fields for wildcard', async function () {
const expectedPath = '/api/index_patterns/_fields_for_wildcard';
- await indexPatternsApiClient.getFieldsForWildcard();
-
- expect(fetchSpy).toHaveBeenCalledWith(expectedPath, expect.any(Object));
- });
-
- test('uses the right URI to fetch fields for wildcard given a type', async function () {
- const expectedPath = '/api/index_patterns/rollup/_fields_for_wildcard';
-
- await indexPatternsApiClient.getFieldsForWildcard({ type: 'rollup' });
+ await indexPatternsApiClient.getFieldsForWildcard({ pattern: 'blah' });
expect(fetchSpy).toHaveBeenCalledWith(expectedPath, expect.any(Object));
});
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts b/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts
index 377a3f7f91a50..ca0f35d6612b2 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts
@@ -19,7 +19,11 @@
import { HttpSetup } from 'src/core/public';
import { IndexPatternMissingIndices } from '../../../common/index_patterns/lib';
-import { GetFieldsOptions, IIndexPatternsApiClient } from '../../../common/index_patterns/types';
+import {
+ GetFieldsOptions,
+ IIndexPatternsApiClient,
+ GetFieldsOptionsTimePattern,
+} from '../../../common/index_patterns/types';
const API_BASE_URL: string = `/api/index_patterns/`;
@@ -48,7 +52,7 @@ export class IndexPatternsApiClient implements IIndexPatternsApiClient {
return API_BASE_URL + path.filter(Boolean).map(encodeURIComponent).join('/');
}
- getFieldsForTimePattern(options: GetFieldsOptions = {}) {
+ getFieldsForTimePattern(options: GetFieldsOptionsTimePattern) {
const { pattern, lookBack, metaFields } = options;
const url = this._getUrl(['_fields_for_time_pattern']);
@@ -60,27 +64,12 @@ export class IndexPatternsApiClient implements IIndexPatternsApiClient {
}).then((resp: any) => resp.fields);
}
- getFieldsForWildcard(options: GetFieldsOptions = {}) {
- const { pattern, metaFields, type, params } = options;
-
- let url;
- let query;
-
- if (type) {
- url = this._getUrl([type, '_fields_for_wildcard']);
- query = {
- pattern,
- meta_fields: metaFields,
- params: JSON.stringify(params),
- };
- } else {
- url = this._getUrl(['_fields_for_wildcard']);
- query = {
- pattern,
- meta_fields: metaFields,
- };
- }
-
- return this._request(url, query).then((resp: any) => resp.fields);
+ getFieldsForWildcard({ pattern, metaFields, type, rollupIndex }: GetFieldsOptions) {
+ return this._request(this._getUrl(['_fields_for_wildcard']), {
+ pattern,
+ meta_fields: metaFields,
+ type,
+ rollup_index: rollupIndex,
+ }).then((resp: any) => resp.fields);
}
}
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 601d64f0bed7e..df74bb6b53e4b 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -6,6 +6,7 @@
import { $Values } from '@kbn/utility-types';
import { Action } from 'history';
+import { Adapters as Adapters_2 } from 'src/plugins/inspector/common';
import { ApiResponse } from '@elastic/elasticsearch';
import { ApiResponse as ApiResponse_2 } from '@elastic/elasticsearch/lib/Transport';
import { ApplicationStart } from 'kibana/public';
@@ -16,6 +17,7 @@ import { CoreSetup } from 'src/core/public';
import { CoreSetup as CoreSetup_2 } from 'kibana/public';
import { CoreStart } from 'kibana/public';
import { CoreStart as CoreStart_2 } from 'src/core/public';
+import { Datatable as Datatable_2 } from 'src/plugins/expressions/common';
import { DatatableColumn as DatatableColumn_2 } from 'src/plugins/expressions';
import { Ensure } from '@kbn/utility-types';
import { EnvironmentMode } from '@kbn/config';
@@ -26,8 +28,12 @@ import { EuiComboBoxProps } from '@elastic/eui';
import { EuiConfirmModalProps } from '@elastic/eui';
import { EuiGlobalToastListToast } from '@elastic/eui';
import { ExclusiveUnion } from '@elastic/eui';
+import { ExecutionContext } from 'src/plugins/expressions/common';
import { ExpressionAstFunction } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition as ExpressionFunctionDefinition_2 } from 'src/plugins/expressions/public';
import { ExpressionsSetup } from 'src/plugins/expressions/public';
+import { ExpressionValueBoxed } from 'src/plugins/expressions/common';
import { History } from 'history';
import { Href } from 'history';
import { IconType } from '@elastic/eui';
@@ -65,7 +71,7 @@ import { Required } from '@kbn/utility-types';
import * as Rx from 'rxjs';
import { SavedObject } from 'src/core/server';
import { SavedObject as SavedObject_2 } from 'src/core/public';
-import { SavedObjectReference as SavedObjectReference_2 } from 'src/core/types';
+import { SavedObjectReference } from 'src/core/types';
import { SavedObjectsClientContract } from 'src/core/public';
import { Search } from '@elastic/elasticsearch/api/requestParams';
import { SearchResponse } from 'elasticsearch';
@@ -80,7 +86,6 @@ import { UiActionsSetup } from 'src/plugins/ui_actions/public';
import { UiActionsStart } from 'src/plugins/ui_actions/public';
import { Unit } from '@elastic/datemath';
import { UnregisterCallback } from 'history';
-import { UnwrapPromiseOrReturn } from '@kbn/utility-types';
import { UserProvidedValues } from 'src/core/server/types';
// Warning: (ae-missing-release-tag) "ACTION_GLOBAL_APPLY_FILTER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -525,7 +530,6 @@ export enum ES_FIELD_TYPES {
// @public (undocumented)
export const ES_SEARCH_STRATEGY = "es";
-// Warning: (ae-forgotten-export) The symbol "ExpressionFunctionDefinition" needs to be exported by the entry point index.d.ts
// Warning: (ae-forgotten-export) The symbol "Input" needs to be exported by the entry point index.d.ts
// Warning: (ae-forgotten-export) The symbol "Arguments" needs to be exported by the entry point index.d.ts
// Warning: (ae-forgotten-export) The symbol "Output" needs to be exported by the entry point index.d.ts
@@ -541,7 +545,7 @@ export type EsaggsExpressionFunctionDefinition = ExpressionFunctionDefinition<'e
// Warning: (ae-missing-release-tag) "EsdslExpressionFunctionDefinition" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-export type EsdslExpressionFunctionDefinition = ExpressionFunctionDefinition;
+export type EsdslExpressionFunctionDefinition = ExpressionFunctionDefinition_2;
// Warning: (ae-missing-release-tag) "esFilters" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
@@ -647,6 +651,15 @@ export type EsQuerySortValue = Record;
+// Warning: (ae-missing-release-tag) "ExecutionContextSearch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type ExecutionContextSearch = {
+ filters?: Filter[];
+ query?: Query | Query[];
+ timeRange?: TimeRange;
+};
+
// Warning: (ae-missing-release-tag) "ExistsFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
@@ -655,12 +668,28 @@ export type ExistsFilter = Filter & {
exists?: FilterExistsProperty;
};
+// Warning: (ae-missing-release-tag) "ExpressionFunctionKibana" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type ExpressionFunctionKibana = ExpressionFunctionDefinition<'kibana', ExpressionValueSearchContext | null, object, ExpressionValueSearchContext, ExecutionContext>;
+
+// Warning: (ae-forgotten-export) The symbol "Arguments" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ExpressionFunctionKibanaContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type ExpressionFunctionKibanaContext = ExpressionFunctionDefinition<'kibana_context', KibanaContext | null, Arguments_2, Promise, ExecutionContext>;
+
+// Warning: (ae-missing-release-tag) "ExpressionValueSearchContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type ExpressionValueSearchContext = ExpressionValueBoxed<'kibana_context', ExecutionContextSearch>;
+
// Warning: (ae-missing-release-tag) "extractReferences" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
export const extractSearchSourceReferences: (state: SearchSourceFields) => [SearchSourceFields & {
indexRefName?: string;
-}, SavedObjectReference_2[]];
+}, SavedObjectReference[]];
// Warning: (ae-missing-release-tag) "FieldFormat" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
@@ -1068,6 +1097,10 @@ export class IndexPattern implements IIndexPattern {
addScriptedField(name: string, script: string, fieldType?: string): Promise;
// (undocumented)
deleteFieldFormat: (fieldName: string) => void;
+ // Warning: (ae-forgotten-export) The symbol "FieldAttrs" needs to be exported by the entry point index.d.ts
+ //
+ // (undocumented)
+ fieldAttrs: FieldAttrs;
// (undocumented)
fieldFormatMap: Record;
// (undocumented)
@@ -1093,9 +1126,7 @@ export class IndexPattern implements IIndexPattern {
time_zone?: string | undefined;
}>> | undefined;
getAsSavedObjectBody(): {
- attributes: {
- fields: import("../types").IndexPatternAttrsFields;
- } | undefined;
+ fieldAttrs: string | undefined;
title: string;
timeFieldName: string | undefined;
intervalName: string | undefined;
@@ -1115,13 +1146,19 @@ export class IndexPattern implements IIndexPattern {
}[];
};
// (undocumented)
+ getFieldAttrs: () => {
+ [x: string]: {
+ customName: string;
+ };
+ };
+ // (undocumented)
getFieldByName(name: string): IndexPatternField | undefined;
getFormatterForField(field: IndexPatternField | IndexPatternField['spec'] | IFieldType): FieldFormat;
getFormatterForFieldNoDefault(fieldname: string): FieldFormat | undefined;
// (undocumented)
getNonScriptedFields(): IndexPatternField[];
getOriginalSavedObjectBody: () => {
- attributes?: IndexPatternAttrs | undefined;
+ fieldAttrs?: string | undefined;
title?: string | undefined;
timeFieldName?: string | undefined;
intervalName?: string | undefined;
@@ -1187,7 +1224,7 @@ export type IndexPatternAggRestrictions = Record, 'isLo
// @public (undocumented)
export interface IndexPatternSpec {
// (undocumented)
- attributes?: IndexPatternAttrs;
+ fieldAttrs?: FieldAttrs;
// (undocumented)
fieldFormats?: Record;
// (undocumented)
@@ -1345,17 +1382,16 @@ export class IndexPatternsService {
//
// (undocumented)
ensureDefaultIndexPattern: EnsureDefaultIndexPattern;
- // Warning: (ae-forgotten-export) The symbol "IndexPatternAttrsFields" needs to be exported by the entry point index.d.ts
- fieldArrayToMap: (fields: FieldSpec[], fieldAttrs?: IndexPatternAttrsFields | undefined) => Record;
+ fieldArrayToMap: (fields: FieldSpec[], fieldAttrs?: FieldAttrs | undefined) => Record;
get: (id: string) => Promise;
// Warning: (ae-forgotten-export) The symbol "IndexPatternSavedObjectAttrs" needs to be exported by the entry point index.d.ts
//
// (undocumented)
getCache: () => Promise[] | null | undefined>;
getDefault: () => Promise;
- getFieldsForIndexPattern: (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions) => Promise;
+ getFieldsForIndexPattern: (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions | undefined) => Promise;
// Warning: (ae-forgotten-export) The symbol "GetFieldsOptions" needs to be exported by the entry point index.d.ts
- getFieldsForWildcard: (options?: GetFieldsOptions) => Promise;
+ getFieldsForWildcard: (options: GetFieldsOptions) => Promise;
getIds: (refresh?: boolean) => Promise;
getIdsWithTitle: (refresh?: boolean) => Promise SearchSourceFields;
+}, references: SavedObjectReference[]) => SearchSourceFields;
// Warning: (ae-missing-release-tag) "InputTimeRange" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
@@ -1525,6 +1561,11 @@ export enum KBN_FIELD_TYPES {
UNKNOWN = "unknown"
}
+// Warning: (ae-missing-release-tag) "KibanaContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type KibanaContext = ExpressionValueSearchContext;
+
// Warning: (ae-missing-release-tag) "KueryNode" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
@@ -1977,8 +2018,8 @@ export const search: {
// Warning: (ae-missing-release-tag) "SearchBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-export const SearchBar: React.ComponentClass, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "dataTestSubj" | "timeHistory" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "indicateNoData" | "onFiltersUpdated">, any> & {
- WrappedComponent: React.ComponentType & ReactIntl.InjectedIntlProps>;
+export const SearchBar: React.ComponentClass, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "showQueryInput" | "showDatePicker" | "showAutoRefreshOnly" | "dateRangeFrom" | "dateRangeTo" | "isRefreshPaused" | "customSubmitButton" | "timeHistory" | "indicateNoData" | "onFiltersUpdated" | "savedQuery" | "showSaveQuery" | "onClearSavedQuery" | "showQueryBar" | "showFilterBar" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated">, any> & {
+ WrappedComponent: React.ComponentType & ReactIntl.InjectedIntlProps>;
};
// Warning: (ae-forgotten-export) The symbol "SearchBarOwnProps" needs to be exported by the entry point index.d.ts
@@ -2303,7 +2344,6 @@ export const UI_SETTINGS: {
// src/plugins/data/common/es_query/filters/phrase_filter.ts:33:3 - (ae-forgotten-export) The symbol "PhraseFilterMeta" needs to be exported by the entry point index.d.ts
// src/plugins/data/common/es_query/filters/phrases_filter.ts:31:3 - (ae-forgotten-export) The symbol "PhrasesFilterMeta" needs to be exported by the entry point index.d.ts
// src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:64:5 - (ae-forgotten-export) The symbol "FormatFieldFn" needs to be exported by the entry point index.d.ts
-// src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:122:29 - (ae-forgotten-export) The symbol "IndexPatternAttrs" needs to be exported by the entry point index.d.ts
// src/plugins/data/common/search/aggs/types.ts:113:51 - (ae-forgotten-export) The symbol "AggTypesRegistryStart" needs to be exported by the entry point index.d.ts
// src/plugins/data/public/field_formats/field_formats_service.ts:67:3 - (ae-forgotten-export) The symbol "FormatFactory" needs to be exported by the entry point index.d.ts
// src/plugins/data/public/index.ts:66:23 - (ae-forgotten-export) The symbol "FILTERS" needs to be exported by the entry point index.d.ts
@@ -2337,21 +2377,21 @@ export const UI_SETTINGS: {
// src/plugins/data/public/index.ts:236:27 - (ae-forgotten-export) The symbol "getFromSavedObject" needs to be exported by the entry point index.d.ts
// src/plugins/data/public/index.ts:236:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts
// src/plugins/data/public/index.ts:236:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:387:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:387:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:387:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:387:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:389:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:390:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:399:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:400:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:401:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:402:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:406:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:407:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:410:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:411:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/index.ts:414:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:393:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:393:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:393:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:393:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:395:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:396:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:405:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:406:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:407:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:408:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:412:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:413:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:416:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:417:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/index.ts:420:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
// src/plugins/data/public/query/state_sync/connect_to_query_state.ts:45:5 - (ae-forgotten-export) The symbol "FilterStateStore" needs to be exported by the entry point index.d.ts
// (No @packageDocumentation comment for this package)
diff --git a/src/plugins/data/public/search/errors/timeout_error.test.tsx b/src/plugins/data/public/search/errors/timeout_error.test.tsx
index ad3384c389fbf..2547ee41cbbd7 100644
--- a/src/plugins/data/public/search/errors/timeout_error.test.tsx
+++ b/src/plugins/data/public/search/errors/timeout_error.test.tsx
@@ -23,7 +23,7 @@ import { coreMock } from '../../../../../core/public/mocks';
const startMock = coreMock.createStart();
import { mount } from 'enzyme';
-import { AbortError } from 'src/plugins/data/common';
+import { AbortError } from '../../../../kibana_utils/public';
describe('SearchTimeoutError', () => {
beforeEach(() => {
diff --git a/src/plugins/data/public/search/expressions/esaggs.ts b/src/plugins/data/public/search/expressions/esaggs.ts
index dba77d398c8b6..3932484801fa8 100644
--- a/src/plugins/data/public/search/expressions/esaggs.ts
+++ b/src/plugins/data/public/search/expressions/esaggs.ts
@@ -267,6 +267,8 @@ export const esaggs = (): EsaggsExpressionFunctionDefinition => ({
searchSource.setField('index', indexPattern);
searchSource.setField('size', 0);
+ const resolvedTimeRange = input?.timeRange && calculateBounds(input.timeRange);
+
const response = await handleCourierRequest({
searchSource,
aggs,
@@ -303,7 +305,10 @@ export const esaggs = (): EsaggsExpressionFunctionDefinition => ({
input?.timeRange &&
args.timeFields &&
args.timeFields.includes(column.aggConfig.params.field?.name)
- ? { from: input.timeRange.from, to: input.timeRange.to }
+ ? {
+ from: resolvedTimeRange?.min?.toISOString(),
+ to: resolvedTimeRange?.max?.toISOString(),
+ }
: undefined,
...column.aggConfig.serialize(),
},
diff --git a/src/plugins/data/public/search/expressions/esdsl.ts b/src/plugins/data/public/search/expressions/esdsl.ts
index 2efb21671b5b7..07e904928744f 100644
--- a/src/plugins/data/public/search/expressions/esdsl.ts
+++ b/src/plugins/data/public/search/expressions/esdsl.ts
@@ -18,15 +18,12 @@
*/
import { i18n } from '@kbn/i18n';
-import {
- KibanaContext,
- ExpressionFunctionDefinition,
-} from '../../../../../plugins/expressions/public';
+import { ExpressionFunctionDefinition } from 'src/plugins/expressions/public';
import { getSearchService, getUiSettings } from '../../services';
import { EsRawResponse } from './es_raw_response';
import { RequestStatistics, RequestAdapter } from '../../../../inspector/common';
-import { IEsSearchResponse } from '../../../common/search/es_search';
+import { IEsSearchResponse, KibanaContext } from '../../../common/search';
import { buildEsQuery, getEsQueryConfig } from '../../../common/es_query/es_query';
import { DataPublicPluginStart } from '../../types';
diff --git a/src/plugins/data/public/search/search_interceptor.test.ts b/src/plugins/data/public/search/search_interceptor.test.ts
index 472caa5e4f45f..60274261da25f 100644
--- a/src/plugins/data/public/search/search_interceptor.test.ts
+++ b/src/plugins/data/public/search/search_interceptor.test.ts
@@ -21,7 +21,7 @@ import { CoreSetup, CoreStart } from '../../../../core/public';
import { coreMock } from '../../../../core/public/mocks';
import { IEsSearchRequest } from '../../common/search';
import { SearchInterceptor } from './search_interceptor';
-import { AbortError } from '../../common';
+import { AbortError } from '../../../kibana_utils/public';
import { SearchTimeoutError, PainlessError, TimeoutErrorMode } from './errors';
import { searchServiceMock } from './mocks';
import { ISearchStart } from '.';
diff --git a/src/plugins/data/public/search/search_interceptor.ts b/src/plugins/data/public/search/search_interceptor.ts
index 3584d75ab86bb..78e65802bcf99 100644
--- a/src/plugins/data/public/search/search_interceptor.ts
+++ b/src/plugins/data/public/search/search_interceptor.ts
@@ -24,13 +24,11 @@ import { PublicMethodsOf } from '@kbn/utility-types';
import { CoreStart, CoreSetup, ToastsSetup } from 'kibana/public';
import { i18n } from '@kbn/i18n';
import {
- AbortError,
IKibanaSearchRequest,
IKibanaSearchResponse,
ISearchOptions,
ES_SEARCH_STRATEGY,
ISessionService,
- getCombinedSignal,
} from '../../common';
import { SearchUsageCollector } from './collectors';
import {
@@ -43,6 +41,7 @@ import {
getHttpError,
} from './errors';
import { toMountPoint } from '../../../kibana_react/public';
+import { AbortError, getCombinedAbortSignal } from '../../../kibana_utils/public';
export interface SearchInterceptorDeps {
http: CoreSetup['http'];
@@ -170,7 +169,9 @@ export class SearchInterceptor {
...(abortSignal ? [abortSignal] : []),
];
- const { signal: combinedSignal, cleanup: cleanupCombinedSignal } = getCombinedSignal(signals);
+ const { signal: combinedSignal, cleanup: cleanupCombinedSignal } = getCombinedAbortSignal(
+ signals
+ );
const cleanup = () => {
subscription.unsubscribe();
combinedSignal.removeEventListener('abort', cleanup);
diff --git a/src/plugins/data/public/search/search_service.ts b/src/plugins/data/public/search/search_service.ts
index e5a50077518af..96fb3f91ea85f 100644
--- a/src/plugins/data/public/search/search_service.ts
+++ b/src/plugins/data/public/search/search_service.ts
@@ -23,10 +23,13 @@ import { ISearchSetup, ISearchStart, SearchEnhancements } from './types';
import { handleResponse } from './fetch';
import {
+ kibana,
+ kibanaContext,
+ kibanaContextFunction,
ISearchGeneric,
- SearchSourceService,
- SearchSourceDependencies,
ISessionService,
+ SearchSourceDependencies,
+ SearchSourceService,
} from '../../common/search';
import { getCallMsearch } from './legacy';
import { AggsService, AggsStartDependencies } from './aggs';
@@ -85,6 +88,10 @@ export class SearchService implements Plugin {
session: this.sessionService,
});
+ expressions.registerFunction(kibana);
+ expressions.registerFunction(kibanaContextFunction);
+ expressions.registerType(kibanaContext);
+
expressions.registerFunction(esdsl);
expressions.registerType(esRawResponse);
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index 9a9b8b67730cc..e24869f5237ea 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -134,6 +134,8 @@ export {
FieldDescriptor as IndexPatternFieldDescriptor,
shouldReadFieldFromDocValues, // used only in logstash_fields fixture
FieldDescriptor,
+ mergeCapabilitiesWithFields,
+ getCapabilitiesForRollupIndices,
} from './index_patterns';
export {
@@ -206,6 +208,12 @@ export {
OptionedParamType,
OptionedValueProp,
ParsedInterval,
+ // expressions
+ ExecutionContextSearch,
+ ExpressionFunctionKibana,
+ ExpressionFunctionKibanaContext,
+ ExpressionValueSearchContext,
+ KibanaContext,
// search
ISearchOptions,
IEsSearchRequest,
diff --git a/src/plugins/data/server/index_patterns/fetcher/index.ts b/src/plugins/data/server/index_patterns/fetcher/index.ts
index 19306696885db..5d8ef62df9627 100644
--- a/src/plugins/data/server/index_patterns/fetcher/index.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/index.ts
@@ -18,4 +18,8 @@
*/
export * from './index_patterns_fetcher';
-export { shouldReadFieldFromDocValues } from './lib';
+export {
+ shouldReadFieldFromDocValues,
+ mergeCapabilitiesWithFields,
+ getCapabilitiesForRollupIndices,
+} from './lib';
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 e75b8761984ec..24dad39088b8f 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
@@ -18,8 +18,15 @@
*/
import { ElasticsearchClient } from 'kibana/server';
+import { keyBy } from 'lodash';
-import { getFieldCapabilities, resolveTimePattern, createNoMatchingIndicesError } from './lib';
+import {
+ getFieldCapabilities,
+ resolveTimePattern,
+ createNoMatchingIndicesError,
+ getCapabilitiesForRollupIndices,
+ mergeCapabilitiesWithFields,
+} from './lib';
export interface FieldDescriptor {
aggregatable: boolean;
@@ -58,11 +65,44 @@ export class IndexPatternsFetcher {
pattern: string | string[];
metaFields?: string[];
fieldCapsOptions?: { allow_no_indices: boolean };
+ type?: string;
+ rollupIndex?: string;
}): Promise {
- const { pattern, metaFields, fieldCapsOptions } = options;
- return await getFieldCapabilities(this.elasticsearchClient, pattern, metaFields, {
- allow_no_indices: fieldCapsOptions ? fieldCapsOptions.allow_no_indices : this.allowNoIndices,
- });
+ const { pattern, metaFields, fieldCapsOptions, type, rollupIndex } = options;
+ const fieldCapsResponse = await getFieldCapabilities(
+ this.elasticsearchClient,
+ pattern,
+ metaFields,
+ {
+ allow_no_indices: fieldCapsOptions
+ ? fieldCapsOptions.allow_no_indices
+ : this.allowNoIndices,
+ }
+ );
+ if (type === 'rollup' && rollupIndex) {
+ const rollupFields: FieldDescriptor[] = [];
+ const rollupIndexCapabilities = getCapabilitiesForRollupIndices(
+ (
+ await this.elasticsearchClient.rollup.getRollupIndexCaps({
+ index: rollupIndex,
+ })
+ ).body
+ )[rollupIndex].aggs;
+ const fieldCapsResponseObj = keyBy(fieldCapsResponse, 'name');
+
+ // Keep meta fields
+ metaFields!.forEach(
+ (field: string) =>
+ fieldCapsResponseObj[field] && rollupFields.push(fieldCapsResponseObj[field])
+ );
+
+ return mergeCapabilitiesWithFields(
+ rollupIndexCapabilities,
+ fieldCapsResponseObj,
+ rollupFields
+ );
+ }
+ return fieldCapsResponse;
}
/**
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/__tests__/fixtures/index.js b/src/plugins/data/server/index_patterns/fetcher/lib/__tests__/fixtures/index.js
new file mode 100644
index 0000000000000..d675702ae54e9
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/__tests__/fixtures/index.js
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { jobs } from './jobs';
diff --git a/x-pack/plugins/rollup/server/lib/__tests__/fixtures/jobs.js b/src/plugins/data/server/index_patterns/fetcher/lib/__tests__/fixtures/jobs.js
similarity index 65%
rename from x-pack/plugins/rollup/server/lib/__tests__/fixtures/jobs.js
rename to src/plugins/data/server/index_patterns/fetcher/lib/__tests__/fixtures/jobs.js
index c03b7c33abe0a..39ebd9595eeaf 100644
--- a/x-pack/plugins/rollup/server/lib/__tests__/fixtures/jobs.js
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/__tests__/fixtures/jobs.js
@@ -1,7 +1,20 @@
/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
export const jobs = [
diff --git a/x-pack/plugins/rollup/server/lib/__tests__/jobs_compatibility.js b/src/plugins/data/server/index_patterns/fetcher/lib/__tests__/jobs_compatibility.js
similarity index 81%
rename from x-pack/plugins/rollup/server/lib/__tests__/jobs_compatibility.js
rename to src/plugins/data/server/index_patterns/fetcher/lib/__tests__/jobs_compatibility.js
index a67f67de859f5..e3c93ac1f8616 100644
--- a/x-pack/plugins/rollup/server/lib/__tests__/jobs_compatibility.js
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/__tests__/jobs_compatibility.js
@@ -1,8 +1,22 @@
/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+
import expect from '@kbn/expect';
import { areJobsCompatible, mergeJobConfigurations } from '../jobs_compatibility';
import { jobs } from './fixtures';
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/index.ts b/src/plugins/data/server/index_patterns/fetcher/lib/index.ts
index 20e74d2b1a579..b2fd3a1a09a25 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/index.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/index.ts
@@ -20,3 +20,5 @@
export { getFieldCapabilities, shouldReadFieldFromDocValues } from './field_capabilities';
export { resolveTimePattern } from './resolve_time_pattern';
export { createNoMatchingIndicesError } from './errors';
+export * from './merge_capabilities_with_fields';
+export * from './map_capabilities';
diff --git a/x-pack/plugins/rollup/server/lib/jobs_compatibility.ts b/src/plugins/data/server/index_patterns/fetcher/lib/jobs_compatibility.ts
similarity index 79%
rename from x-pack/plugins/rollup/server/lib/jobs_compatibility.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/jobs_compatibility.ts
index f5f54cf9a54e8..f21de8907ee24 100644
--- a/x-pack/plugins/rollup/server/lib/jobs_compatibility.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/jobs_compatibility.ts
@@ -1,7 +1,20 @@
/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import { isEqual } from 'lodash';
diff --git a/src/plugins/visualizations/public/wizard/type_selection/vis_help_text.tsx b/src/plugins/data/server/index_patterns/fetcher/lib/map_capabilities.ts
similarity index 53%
rename from src/plugins/visualizations/public/wizard/type_selection/vis_help_text.tsx
rename to src/plugins/data/server/index_patterns/fetcher/lib/map_capabilities.ts
index 8517919955f7c..6187174834012 100644
--- a/src/plugins/visualizations/public/wizard/type_selection/vis_help_text.tsx
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/map_capabilities.ts
@@ -17,34 +17,21 @@
* under the License.
*/
-import React from 'react';
+import { mergeJobConfigurations } from './jobs_compatibility';
-import { EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
+export function getCapabilitiesForRollupIndices(indices: { [key: string]: any }) {
+ const indexNames = Object.keys(indices);
+ const capabilities = {} as { [key: string]: any };
-interface VisHelpTextProps {
- name: string;
- title: string;
- description?: string;
- highlightMsg?: string;
-}
+ indexNames.forEach((index) => {
+ try {
+ capabilities[index] = mergeJobConfigurations(indices[index].rollup_jobs);
+ } catch (e) {
+ capabilities[index] = {
+ error: e.message,
+ };
+ }
+ });
-export const VisHelpText = ({ name, title, description, highlightMsg }: VisHelpTextProps) => {
- return (
-
-
-
-
- );
-};
+ return capabilities;
+}
diff --git a/x-pack/plugins/rollup/server/lib/merge_capabilities_with_fields.ts b/src/plugins/data/server/index_patterns/fetcher/lib/merge_capabilities_with_fields.ts
similarity index 70%
rename from x-pack/plugins/rollup/server/lib/merge_capabilities_with_fields.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/merge_capabilities_with_fields.ts
index 51111e9e45d0a..dd69f4b7ff007 100644
--- a/x-pack/plugins/rollup/server/lib/merge_capabilities_with_fields.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/merge_capabilities_with_fields.ts
@@ -1,20 +1,30 @@
/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
// Merge rollup capabilities information with field information
-export interface Field {
- name?: string;
- [key: string]: any;
-}
+import { FieldDescriptor } from '../index_patterns_fetcher';
export const mergeCapabilitiesWithFields = (
rollupIndexCapabilities: { [key: string]: any },
fieldsFromFieldCapsApi: { [key: string]: any },
- previousFields: Field[] = []
+ previousFields: FieldDescriptor[] = []
) => {
const rollupFields = [...previousFields];
const rollupFieldNames: string[] = [];
diff --git a/src/plugins/data/server/index_patterns/index.ts b/src/plugins/data/server/index_patterns/index.ts
index 683d1c445fd72..3305b1bb9a92f 100644
--- a/src/plugins/data/server/index_patterns/index.ts
+++ b/src/plugins/data/server/index_patterns/index.ts
@@ -17,5 +17,11 @@
* under the License.
*/
export * from './utils';
-export { IndexPatternsFetcher, FieldDescriptor, shouldReadFieldFromDocValues } from './fetcher';
+export {
+ IndexPatternsFetcher,
+ FieldDescriptor,
+ shouldReadFieldFromDocValues,
+ mergeCapabilitiesWithFields,
+ getCapabilitiesForRollupIndices,
+} from './fetcher';
export { IndexPatternsService, IndexPatternsServiceStart } from './index_patterns_service';
diff --git a/src/plugins/data/server/index_patterns/index_patterns_api_client.ts b/src/plugins/data/server/index_patterns/index_patterns_api_client.ts
index 2dc6f40c5a6f1..21a3bf6e73e61 100644
--- a/src/plugins/data/server/index_patterns/index_patterns_api_client.ts
+++ b/src/plugins/data/server/index_patterns/index_patterns_api_client.ts
@@ -17,13 +17,30 @@
* under the License.
*/
-import { GetFieldsOptions, IIndexPatternsApiClient } from '../../common/index_patterns/types';
+import { ElasticsearchClient } from 'kibana/server';
+import {
+ GetFieldsOptions,
+ IIndexPatternsApiClient,
+ GetFieldsOptionsTimePattern,
+} from '../../common/index_patterns/types';
+import { IndexPatternsFetcher } from './fetcher';
export class IndexPatternsApiServer implements IIndexPatternsApiClient {
- async getFieldsForTimePattern(options: GetFieldsOptions = {}) {
- throw new Error('IndexPatternsApiServer - getFieldsForTimePattern not defined');
+ esClient: ElasticsearchClient;
+ constructor(elasticsearchClient: ElasticsearchClient) {
+ this.esClient = elasticsearchClient;
}
- async getFieldsForWildcard(options: GetFieldsOptions = {}) {
- throw new Error('IndexPatternsApiServer - getFieldsForWildcard not defined');
+ async getFieldsForWildcard({ pattern, metaFields, type, rollupIndex }: GetFieldsOptions) {
+ const indexPatterns = new IndexPatternsFetcher(this.esClient);
+ return await indexPatterns.getFieldsForWildcard({
+ pattern,
+ metaFields,
+ type,
+ rollupIndex,
+ });
+ }
+ async getFieldsForTimePattern(options: GetFieldsOptionsTimePattern) {
+ const indexPatterns = new IndexPatternsFetcher(this.esClient);
+ return await indexPatterns.getFieldsForTimePattern(options);
}
}
diff --git a/src/plugins/data/server/index_patterns/index_patterns_service.ts b/src/plugins/data/server/index_patterns/index_patterns_service.ts
index d665e3715fa72..af2d4d6a73e0f 100644
--- a/src/plugins/data/server/index_patterns/index_patterns_service.ts
+++ b/src/plugins/data/server/index_patterns/index_patterns_service.ts
@@ -17,7 +17,14 @@
* under the License.
*/
-import { CoreSetup, CoreStart, Plugin, Logger, SavedObjectsClientContract } from 'kibana/server';
+import {
+ CoreSetup,
+ CoreStart,
+ Plugin,
+ Logger,
+ SavedObjectsClientContract,
+ ElasticsearchClient,
+} from 'kibana/server';
import { registerRoutes } from './routes';
import { indexPatternSavedObjectType } from '../saved_objects';
import { capabilitiesProvider } from './capabilities_provider';
@@ -29,7 +36,8 @@ import { SavedObjectsClientServerToCommon } from './saved_objects_client_wrapper
export interface IndexPatternsServiceStart {
indexPatternsServiceFactory: (
- savedObjectsClient: SavedObjectsClientContract
+ savedObjectsClient: SavedObjectsClientContract,
+ elasticsearchClient: ElasticsearchClient
) => Promise;
}
@@ -50,14 +58,17 @@ export class IndexPatternsService implements Plugin {
+ indexPatternsServiceFactory: async (
+ savedObjectsClient: SavedObjectsClientContract,
+ elasticsearchClient: ElasticsearchClient
+ ) => {
const uiSettingsClient = uiSettings.asScopedToClient(savedObjectsClient);
const formats = await fieldFormats.fieldFormatServiceFactory(uiSettingsClient);
return new IndexPatternsCommonService({
uiSettings: new UiSettingsServerToCommon(uiSettingsClient),
savedObjectsClient: new SavedObjectsClientServerToCommon(savedObjectsClient),
- apiClient: new IndexPatternsApiServer(),
+ apiClient: new IndexPatternsApiServer(elasticsearchClient),
fieldFormats: formats,
onError: (error) => {
logger.error(error);
diff --git a/src/plugins/data/server/index_patterns/routes.ts b/src/plugins/data/server/index_patterns/routes.ts
index 041eb235d01e0..f8af52954fc61 100644
--- a/src/plugins/data/server/index_patterns/routes.ts
+++ b/src/plugins/data/server/index_patterns/routes.ts
@@ -42,13 +42,15 @@ export function registerRoutes(http: HttpServiceSetup) {
meta_fields: schema.oneOf([schema.string(), schema.arrayOf(schema.string())], {
defaultValue: [],
}),
+ type: schema.maybe(schema.string()),
+ rollup_index: schema.maybe(schema.string()),
}),
},
},
async (context, request, response) => {
const { asCurrentUser } = context.core.elasticsearch.client;
const indexPatterns = new IndexPatternsFetcher(asCurrentUser);
- const { pattern, meta_fields: metaFields } = request.query;
+ const { pattern, meta_fields: metaFields, type, rollup_index: rollupIndex } = request.query;
let parsedFields: string[] = [];
try {
@@ -61,6 +63,8 @@ export function registerRoutes(http: HttpServiceSetup) {
const fields = await indexPatterns.getFieldsForWildcard({
pattern,
metaFields: parsedFields,
+ type,
+ rollupIndex,
});
return response.ok({
diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts
index 88f24b7ca5a70..3ec4e7e64e382 100644
--- a/src/plugins/data/server/plugin.ts
+++ b/src/plugins/data/server/plugin.ts
@@ -96,7 +96,7 @@ export class DataServerPlugin
core.uiSettings.register(getUiSettings());
const searchSetup = this.searchService.setup(core, {
- registerFunction: expressions.registerFunction,
+ expressions,
usageCollection,
});
diff --git a/src/plugins/data/server/saved_objects/index_patterns.ts b/src/plugins/data/server/saved_objects/index_patterns.ts
index 9e583bd14fd21..6aabcdf7c1c01 100644
--- a/src/plugins/data/server/saved_objects/index_patterns.ts
+++ b/src/plugins/data/server/saved_objects/index_patterns.ts
@@ -46,7 +46,6 @@ export const indexPatternSavedObjectType: SavedObjectsType = {
properties: {
title: { type: 'text' },
type: { type: 'keyword' },
- attributes: { type: 'object', enabled: false },
},
},
migrations: indexPatternSavedObjectTypeMigrations as any,
diff --git a/src/plugins/data/server/search/aggs/aggs_service.test.ts b/src/plugins/data/server/search/aggs/aggs_service.test.ts
index cb4239cc339c4..e58420f6c2f07 100644
--- a/src/plugins/data/server/search/aggs/aggs_service.test.ts
+++ b/src/plugins/data/server/search/aggs/aggs_service.test.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest, ElasticsearchClient } from 'src/core/server';
import { coreMock } from '../../../../../core/server/mocks';
import { expressionsPluginMock } from '../../../../../plugins/expressions/server/mocks';
@@ -63,7 +63,8 @@ describe('AggsService - server', () => {
expect(start).toHaveProperty('asScopedToClient');
const contract = await start.asScopedToClient(
- savedObjects.getScopedClient({} as KibanaRequest)
+ savedObjects.getScopedClient({} as KibanaRequest),
+ {} as ElasticsearchClient
);
expect(contract).toHaveProperty('calculateAutoTimeExpression');
expect(contract).toHaveProperty('createAggConfigs');
@@ -74,7 +75,10 @@ describe('AggsService - server', () => {
service.setup(setupDeps);
const start = await service
.start(startDeps)
- .asScopedToClient(savedObjects.getScopedClient({} as KibanaRequest));
+ .asScopedToClient(
+ savedObjects.getScopedClient({} as KibanaRequest),
+ {} as ElasticsearchClient
+ );
expect(start.types.get('terms').name).toBe('terms');
});
@@ -83,7 +87,10 @@ describe('AggsService - server', () => {
service.setup(setupDeps);
const start = await service
.start(startDeps)
- .asScopedToClient(savedObjects.getScopedClient({} as KibanaRequest));
+ .asScopedToClient(
+ savedObjects.getScopedClient({} as KibanaRequest),
+ {} as ElasticsearchClient
+ );
const aggTypes = getAggTypes();
expect(start.types.getAll().buckets.length).toBe(aggTypes.buckets.length);
@@ -103,7 +110,10 @@ describe('AggsService - server', () => {
const start = await service
.start(startDeps)
- .asScopedToClient(savedObjects.getScopedClient({} as KibanaRequest));
+ .asScopedToClient(
+ savedObjects.getScopedClient({} as KibanaRequest),
+ {} as ElasticsearchClient
+ );
const aggTypes = getAggTypes();
expect(start.types.getAll().buckets.length).toBe(aggTypes.buckets.length + 1);
diff --git a/src/plugins/data/server/search/aggs/aggs_service.ts b/src/plugins/data/server/search/aggs/aggs_service.ts
index c805c8af6694c..c23f748b1eeb5 100644
--- a/src/plugins/data/server/search/aggs/aggs_service.ts
+++ b/src/plugins/data/server/search/aggs/aggs_service.ts
@@ -19,7 +19,11 @@
import { pick } from 'lodash';
-import { UiSettingsServiceStart, SavedObjectsClientContract } from 'src/core/server';
+import {
+ UiSettingsServiceStart,
+ SavedObjectsClientContract,
+ ElasticsearchClient,
+} from 'src/core/server';
import { ExpressionsServiceSetup } from 'src/plugins/expressions/common';
import {
AggsCommonService,
@@ -65,7 +69,10 @@ export class AggsService {
public start({ fieldFormats, uiSettings, indexPatterns }: AggsStartDependencies): AggsStart {
return {
- asScopedToClient: async (savedObjectsClient: SavedObjectsClientContract) => {
+ asScopedToClient: async (
+ savedObjectsClient: SavedObjectsClientContract,
+ elasticsearchClient: ElasticsearchClient
+ ) => {
const uiSettingsClient = uiSettings.asScopedToClient(savedObjectsClient);
const formats = await fieldFormats.fieldFormatServiceFactory(uiSettingsClient);
@@ -82,8 +89,9 @@ export class AggsService {
types,
} = this.aggsCommonService.start({
getConfig,
- getIndexPattern: (await indexPatterns.indexPatternsServiceFactory(savedObjectsClient))
- .get,
+ getIndexPattern: (
+ await indexPatterns.indexPatternsServiceFactory(savedObjectsClient, elasticsearchClient)
+ ).get,
isDefaultTimezone,
});
diff --git a/src/plugins/data/server/search/aggs/types.ts b/src/plugins/data/server/search/aggs/types.ts
index 1b21d948b25d9..2c28c970cbb84 100644
--- a/src/plugins/data/server/search/aggs/types.ts
+++ b/src/plugins/data/server/search/aggs/types.ts
@@ -17,11 +17,14 @@
* under the License.
*/
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract, ElasticsearchClient } from 'src/core/server';
import { AggsCommonSetup, AggsStart as Start } from '../../../common';
export type AggsSetup = AggsCommonSetup;
export interface AggsStart {
- asScopedToClient: (savedObjectsClient: SavedObjectsClientContract) => Promise;
+ asScopedToClient: (
+ savedObjectsClient: SavedObjectsClientContract,
+ elasticsearchClient: ElasticsearchClient
+ ) => Promise;
}
diff --git a/src/plugins/data/server/search/search_service.test.ts b/src/plugins/data/server/search/search_service.test.ts
index 2b513be147e9d..0700afd8d6c83 100644
--- a/src/plugins/data/server/search/search_service.test.ts
+++ b/src/plugins/data/server/search/search_service.test.ts
@@ -44,7 +44,10 @@ describe('Search service', () => {
it('exposes proper contract', async () => {
const setup = plugin.setup(mockCoreSetup, ({
packageInfo: { version: '8' },
- registerFunction: jest.fn(),
+ expressions: {
+ registerFunction: jest.fn(),
+ registerType: jest.fn(),
+ },
} as unknown) as SearchServiceSetupDependencies);
expect(setup).toHaveProperty('aggs');
expect(setup).toHaveProperty('registerSearchStrategy');
diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts
index c500c62914c0b..d8aa588719e3e 100644
--- a/src/plugins/data/server/search/search_service.ts
+++ b/src/plugins/data/server/search/search_service.ts
@@ -30,6 +30,7 @@ import {
StartServicesAccessor,
} from 'src/core/server';
import { first } from 'rxjs/operators';
+import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
import {
ISearchSetup,
ISearchStart,
@@ -38,7 +39,7 @@ import {
SearchStrategyDependencies,
} from './types';
-import { AggsService, AggsSetupDependencies } from './aggs';
+import { AggsService } from './aggs';
import { FieldFormatsStart } from '../field_formats';
import { IndexPatternsServiceStart } from '../index_patterns';
@@ -50,15 +51,18 @@ import { registerUsageCollector } from './collectors/register';
import { usageProvider } from './collectors/usage';
import { searchTelemetry } from '../saved_objects';
import {
- IKibanaSearchRequest,
- IKibanaSearchResponse,
IEsSearchRequest,
IEsSearchResponse,
+ IKibanaSearchRequest,
+ IKibanaSearchResponse,
+ ISearchClient,
+ ISearchOptions,
+ kibana,
+ kibanaContext,
+ kibanaContextFunction,
SearchSourceDependencies,
- SearchSourceService,
searchSourceRequiredUiSettings,
- ISearchOptions,
- ISearchClient,
+ SearchSourceService,
} from '../../common/search';
import {
getShardDelayBucketAgg,
@@ -77,7 +81,7 @@ type StrategyMap = Record>;
/** @internal */
export interface SearchServiceSetupDependencies {
- registerFunction: AggsSetupDependencies['registerFunction'];
+ expressions: ExpressionsServerSetup;
usageCollection?: UsageCollectionSetup;
}
@@ -106,7 +110,7 @@ export class SearchService implements Plugin {
public setup(
core: CoreSetup<{}, DataPluginStart>,
- { registerFunction, usageCollection }: SearchServiceSetupDependencies
+ { expressions, usageCollection }: SearchServiceSetupDependencies
): ISearchSetup {
const usage = usageCollection ? usageProvider(core) : undefined;
@@ -137,7 +141,11 @@ export class SearchService implements Plugin {
registerUsageCollector(usageCollection, this.initializerContext);
}
- const aggs = this.aggsService.setup({ registerFunction });
+ expressions.registerFunction(kibana);
+ expressions.registerFunction(kibanaContextFunction);
+ expressions.registerType(kibanaContext);
+
+ const aggs = this.aggsService.setup({ registerFunction: expressions.registerFunction });
this.initializerContext.config
.create()
@@ -146,7 +154,7 @@ export class SearchService implements Plugin {
.then((value) => {
if (value.search.aggs.shardDelay.enabled) {
aggs.types.registerBucket(SHARD_DELAY_AGG_NAME, getShardDelayBucketAgg);
- registerFunction(aggShardDelay);
+ expressions.registerFunction(aggShardDelay);
}
});
@@ -169,7 +177,11 @@ export class SearchService implements Plugin {
const { elasticsearch, savedObjects, uiSettings } = core;
const asScoped = this.asScopedProvider(core);
return {
- aggs: this.aggsService.start({ fieldFormats, uiSettings, indexPatterns }),
+ aggs: this.aggsService.start({
+ fieldFormats,
+ uiSettings,
+ indexPatterns,
+ }),
getSearchStrategy: this.getSearchStrategy,
asScoped,
searchSource: {
@@ -177,7 +189,8 @@ export class SearchService implements Plugin {
const esClient = elasticsearch.client.asScoped(request);
const savedObjectsClient = savedObjects.getScopedClient(request);
const scopedIndexPatterns = await indexPatterns.indexPatternsServiceFactory(
- savedObjectsClient
+ savedObjectsClient,
+ esClient.asCurrentUser
);
const uiSettingsClient = uiSettings.asScopedToClient(savedObjectsClient);
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 717449f66853a..5b4004baaf768 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -5,6 +5,7 @@
```ts
import { $Values } from '@kbn/utility-types';
+import { Adapters } from 'src/plugins/inspector/common';
import { ApiResponse } from '@elastic/elasticsearch';
import { Assign } from '@kbn/utility-types';
import { BehaviorSubject } from 'rxjs';
@@ -13,14 +14,19 @@ import { CoreSetup } from 'src/core/server';
import { CoreSetup as CoreSetup_2 } from 'kibana/server';
import { CoreStart } from 'src/core/server';
import { CoreStart as CoreStart_2 } from 'kibana/server';
+import { Datatable } from 'src/plugins/expressions/common';
import { DatatableColumn } from 'src/plugins/expressions';
import { Duration } from 'moment';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient as ElasticsearchClient_2 } from 'kibana/server';
import { Ensure } from '@kbn/utility-types';
import { EnvironmentMode } from '@kbn/config';
import { ErrorToastOptions } from 'src/core/public/notifications';
+import { ExecutionContext } from 'src/plugins/expressions/common';
import { ExpressionAstFunction } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
+import { ExpressionValueBoxed } from 'src/plugins/expressions/common';
import { ISavedObjectsRepository } from 'kibana/server';
import { IScopedClusterClient } from 'src/core/server';
import { ISearchOptions as ISearchOptions_2 } from 'src/plugins/data/public';
@@ -55,7 +61,6 @@ import { ToastInputFields } from 'src/core/public/notifications';
import { Type } from '@kbn/config-schema';
import { TypeOf } from '@kbn/config-schema';
import { Unit } from '@elastic/datemath';
-import { UnwrapPromiseOrReturn } from '@kbn/utility-types';
// Warning: (ae-forgotten-export) The symbol "AggConfigSerialized" needs to be exported by the entry point index.d.ts
// Warning: (ae-missing-release-tag) "AggConfigOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -224,7 +229,6 @@ export enum ES_FIELD_TYPES {
// @public (undocumented)
export const ES_SEARCH_STRATEGY = "es";
-// Warning: (ae-forgotten-export) The symbol "ExpressionFunctionDefinition" needs to be exported by the entry point index.d.ts
// Warning: (ae-forgotten-export) The symbol "Input" needs to be exported by the entry point index.d.ts
// Warning: (ae-forgotten-export) The symbol "Arguments" needs to be exported by the entry point index.d.ts
// Warning: (ae-forgotten-export) The symbol "Output" needs to be exported by the entry point index.d.ts
@@ -285,6 +289,31 @@ export interface EsQueryConfig {
queryStringOptions: Record;
}
+// Warning: (ae-missing-release-tag) "ExecutionContextSearch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type ExecutionContextSearch = {
+ filters?: Filter[];
+ query?: Query | Query[];
+ timeRange?: TimeRange;
+};
+
+// Warning: (ae-missing-release-tag) "ExpressionFunctionKibana" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type ExpressionFunctionKibana = ExpressionFunctionDefinition<'kibana', ExpressionValueSearchContext | null, object, ExpressionValueSearchContext, ExecutionContext>;
+
+// Warning: (ae-forgotten-export) The symbol "Arguments" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ExpressionFunctionKibanaContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type ExpressionFunctionKibanaContext = ExpressionFunctionDefinition<'kibana_context', KibanaContext | null, Arguments_2, Promise, ExecutionContext>;
+
+// Warning: (ae-missing-release-tag) "ExpressionValueSearchContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type ExpressionValueSearchContext = ExpressionValueBoxed<'kibana_context', ExecutionContextSearch>;
+
// Warning: (ae-missing-release-tag) "FieldDescriptor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
@@ -361,6 +390,15 @@ export type Filter = {
query?: any;
};
+// Warning: (ae-missing-release-tag) "getCapabilitiesForRollupIndices" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function getCapabilitiesForRollupIndices(indices: {
+ [key: string]: any;
+}): {
+ [key: string]: any;
+};
+
// Warning: (ae-forgotten-export) The symbol "IUiSettingsClient" needs to be exported by the entry point index.d.ts
// Warning: (ae-missing-release-tag) "getDefaultSearchParams" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
@@ -520,6 +558,10 @@ export class IndexPattern implements IIndexPattern {
addScriptedField(name: string, script: string, fieldType?: string): Promise;
// (undocumented)
deleteFieldFormat: (fieldName: string) => void;
+ // Warning: (ae-forgotten-export) The symbol "FieldAttrs" needs to be exported by the entry point index.d.ts
+ //
+ // (undocumented)
+ fieldAttrs: FieldAttrs;
// (undocumented)
fieldFormatMap: Record;
// Warning: (ae-forgotten-export) The symbol "IIndexPatternFieldList" needs to be exported by the entry point index.d.ts
@@ -547,9 +589,7 @@ export class IndexPattern implements IIndexPattern {
time_zone?: string | undefined;
}>> | undefined;
getAsSavedObjectBody(): {
- attributes: {
- fields: import("../types").IndexPatternAttrsFields;
- } | undefined;
+ fieldAttrs: string | undefined;
title: string;
timeFieldName: string | undefined;
intervalName: string | undefined;
@@ -569,6 +609,12 @@ export class IndexPattern implements IIndexPattern {
}[];
};
// (undocumented)
+ getFieldAttrs: () => {
+ [x: string]: {
+ customName: string;
+ };
+ };
+ // (undocumented)
getFieldByName(name: string): IndexPatternField | undefined;
getFormatterForField(field: IndexPatternField | IndexPatternField['spec'] | IFieldType): FieldFormat;
getFormatterForFieldNoDefault(fieldname: string): FieldFormat | undefined;
@@ -577,7 +623,7 @@ export class IndexPattern implements IIndexPattern {
// (undocumented)
getNonScriptedFields(): IndexPatternField[];
getOriginalSavedObjectBody: () => {
- attributes?: IndexPatternAttrs | undefined;
+ fieldAttrs?: string | undefined;
title?: string | undefined;
timeFieldName?: string | undefined;
intervalName?: string | undefined;
@@ -637,7 +683,7 @@ export class IndexPattern implements IIndexPattern {
// @public (undocumented)
export interface IndexPatternAttributes {
// (undocumented)
- attributes?: IndexPatternAttrs;
+ fieldAttrs?: string;
// (undocumented)
fieldFormatMap?: string;
// (undocumented)
@@ -668,7 +714,7 @@ export const indexPatterns: {
//
// @public (undocumented)
export class IndexPatternsFetcher {
- constructor(elasticsearchClient: ElasticsearchClient, allowNoIndices?: boolean);
+ constructor(elasticsearchClient: ElasticsearchClient_2, allowNoIndices?: boolean);
getFieldsForTimePattern(options: {
pattern: string;
metaFields: string[];
@@ -681,6 +727,8 @@ export class IndexPatternsFetcher {
fieldCapsOptions?: {
allow_no_indices: boolean;
};
+ type?: string;
+ rollupIndex?: string;
}): Promise;
}
@@ -695,7 +743,7 @@ export class IndexPatternsService implements Plugin_3 Promise;
+ indexPatternsServiceFactory: (savedObjectsClient: SavedObjectsClientContract_2, elasticsearchClient: ElasticsearchClient_2) => Promise;
};
}
@@ -787,6 +835,11 @@ export enum KBN_FIELD_TYPES {
UNKNOWN = "unknown"
}
+// Warning: (ae-missing-release-tag) "KibanaContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type KibanaContext = ExpressionValueSearchContext;
+
// Warning: (ae-missing-release-tag) "KueryNode" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
@@ -799,6 +852,15 @@ export interface KueryNode {
type: keyof NodeTypes;
}
+// Warning: (ae-missing-release-tag) "mergeCapabilitiesWithFields" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const mergeCapabilitiesWithFields: (rollupIndexCapabilities: {
+ [key: string]: any;
+}, fieldsFromFieldCapsApi: {
+ [key: string]: any;
+}, previousFields?: FieldDescriptor[]) => FieldDescriptor[];
+
// Warning: (ae-missing-release-tag) "METRIC_TYPES" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
@@ -893,7 +955,7 @@ export class Plugin implements Plugin_2 void;
search: ISearchSetup;
fieldFormats: {
- register: (customFieldFormat: import("../public").FieldFormatInstanceType) => number;
+ register: (customFieldFormat: import("../common").FieldFormatInstanceType) => number;
};
};
// (undocumented)
@@ -902,7 +964,7 @@ export class Plugin implements Plugin_2 Promise;
};
indexPatterns: {
- indexPatternsServiceFactory: (savedObjectsClient: Pick) => Promise;
+ indexPatternsServiceFactory: (savedObjectsClient: Pick, elasticsearchClient: import("src/core/server").ElasticsearchClient) => Promise;
};
search: ISearchStart>;
};
@@ -1149,7 +1211,6 @@ export function usageProvider(core: CoreSetup_2): SearchUsage;
// src/plugins/data/common/es_query/filters/meta_filter.ts:54:3 - (ae-forgotten-export) The symbol "FilterMeta" needs to be exported by the entry point index.d.ts
// src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:58:45 - (ae-forgotten-export) The symbol "IndexPatternFieldMap" needs to be exported by the entry point index.d.ts
// src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:64:5 - (ae-forgotten-export) The symbol "FormatFieldFn" needs to be exported by the entry point index.d.ts
-// src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:122:29 - (ae-forgotten-export) The symbol "IndexPatternAttrs" needs to be exported by the entry point index.d.ts
// src/plugins/data/server/index.ts:40:23 - (ae-forgotten-export) The symbol "buildCustomFilter" needs to be exported by the entry point index.d.ts
// src/plugins/data/server/index.ts:40:23 - (ae-forgotten-export) The symbol "buildFilter" needs to be exported by the entry point index.d.ts
// src/plugins/data/server/index.ts:71:21 - (ae-forgotten-export) The symbol "getEsQueryConfig" needs to be exported by the entry point index.d.ts
@@ -1171,22 +1232,22 @@ export function usageProvider(core: CoreSetup_2): SearchUsage;
// src/plugins/data/server/index.ts:101:26 - (ae-forgotten-export) The symbol "TruncateFormat" needs to be exported by the entry point index.d.ts
// src/plugins/data/server/index.ts:127:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts
// src/plugins/data/server/index.ts:127:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:235:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:235:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:235:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:235:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:250:5 - (ae-forgotten-export) The symbol "getTotalLoaded" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:251:5 - (ae-forgotten-export) The symbol "toSnakeCase" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:255:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:256:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:265:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:266:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:267:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:271:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:272:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:276:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:279:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index_patterns/index_patterns_service.ts:50:14 - (ae-forgotten-export) The symbol "IndexPatternsService" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:243:20 - (ae-forgotten-export) The symbol "getRequestInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:243:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:243:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:243:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:258:5 - (ae-forgotten-export) The symbol "getTotalLoaded" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:259:5 - (ae-forgotten-export) The symbol "toSnakeCase" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:263:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:264:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:273:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:274:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:275:1 - (ae-forgotten-export) The symbol "Ipv4Address" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:279:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:280:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:284:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:287:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index_patterns/index_patterns_service.ts:58:14 - (ae-forgotten-export) The symbol "IndexPatternsService" needs to be exported by the entry point index.d.ts
// src/plugins/data/server/plugin.ts:88:66 - (ae-forgotten-export) The symbol "DataEnhancements" needs to be exported by the entry point index.d.ts
// src/plugins/data/server/search/types.ts:104:5 - (ae-forgotten-export) The symbol "ISearchStartSearchSource" needs to be exported by the entry point index.d.ts
diff --git a/src/plugins/embeddable/public/lib/containers/container.ts b/src/plugins/embeddable/public/lib/containers/container.ts
index 9f701f021162a..4dede8bf5d752 100644
--- a/src/plugins/embeddable/public/lib/containers/container.ts
+++ b/src/plugins/embeddable/public/lib/containers/container.ts
@@ -19,6 +19,7 @@
import uuid from 'uuid';
import { merge, Subscription } from 'rxjs';
+import { startWith, pairwise } from 'rxjs/operators';
import {
Embeddable,
EmbeddableInput,
@@ -55,7 +56,12 @@ export abstract class Container<
parent?: Container
) {
super(input, output, parent);
- this.subscription = this.getInput$().subscribe(() => this.maybeUpdateChildren());
+ this.subscription = this.getInput$()
+ // At each update event, get both the previous and current state
+ .pipe(startWith(input), pairwise())
+ .subscribe(([{ panels: prevPanels }, { panels: currentPanels }]) => {
+ this.maybeUpdateChildren(currentPanels, prevPanels);
+ });
}
public updateInputForChild(
@@ -329,16 +335,30 @@ export abstract class Container<
return embeddable;
}
- private maybeUpdateChildren() {
- const allIds = Object.keys({ ...this.input.panels, ...this.output.embeddableLoaded });
+ private panelHasChanged(currentPanel: PanelState, prevPanel: PanelState) {
+ if (currentPanel.type !== prevPanel.type) {
+ return true;
+ }
+ }
+
+ private maybeUpdateChildren(
+ currentPanels: TContainerInput['panels'],
+ prevPanels: TContainerInput['panels']
+ ) {
+ const allIds = Object.keys({ ...currentPanels, ...this.output.embeddableLoaded });
allIds.forEach((id) => {
- if (this.input.panels[id] !== undefined && this.output.embeddableLoaded[id] === undefined) {
- this.onPanelAdded(this.input.panels[id]);
- } else if (
- this.input.panels[id] === undefined &&
- this.output.embeddableLoaded[id] !== undefined
- ) {
- this.onPanelRemoved(id);
+ if (currentPanels[id] !== undefined && this.output.embeddableLoaded[id] === undefined) {
+ return this.onPanelAdded(currentPanels[id]);
+ }
+ if (currentPanels[id] === undefined && this.output.embeddableLoaded[id] !== undefined) {
+ return this.onPanelRemoved(id);
+ }
+ // In case of type change, remove and add a panel with the same id
+ if (currentPanels[id] && prevPanels[id]) {
+ if (this.panelHasChanged(currentPanels[id], prevPanels[id])) {
+ this.onPanelRemoved(id);
+ this.onPanelAdded(currentPanels[id]);
+ }
}
});
}
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
index c7afc157c1452..31df5c5085f8b 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
@@ -43,6 +43,7 @@ export abstract class Embeddable<
public readonly isContainer: boolean = false;
public abstract readonly type: string;
public readonly id: string;
+ public fatalError?: Error;
protected output: TEmbeddableOutput;
protected input: TEmbeddableInput;
@@ -88,9 +89,12 @@ export abstract class Embeddable<
map(({ title }) => title || ''),
distinctUntilChanged()
)
- .subscribe((title) => {
- this.renderComplete.setTitle(title);
- });
+ .subscribe(
+ (title) => {
+ this.renderComplete.setTitle(title);
+ },
+ () => {}
+ );
}
public getIsContainer(): this is IContainer {
@@ -193,6 +197,11 @@ export abstract class Embeddable<
}
}
+ protected onFatalError(e: Error) {
+ this.fatalError = e;
+ this.output$.error(e);
+ }
+
private onResetInput(newInput: TEmbeddableInput) {
if (!isEqual(this.input, newInput)) {
const oldLastReloadRequestTime = this.input.lastReloadRequestTime;
diff --git a/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx
index cdbe7af98a4f4..34d971cbb717a 100644
--- a/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx
@@ -30,7 +30,7 @@ export const ERROR_EMBEDDABLE_TYPE = 'error';
export function isErrorEmbeddable(
embeddable: TEmbeddable | ErrorEmbeddable
): embeddable is ErrorEmbeddable {
- return (embeddable as ErrorEmbeddable).error !== undefined;
+ return Boolean(embeddable.fatalError || (embeddable as ErrorEmbeddable).error !== undefined);
}
export class ErrorEmbeddable extends Embeddable {
diff --git a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
index 3843950c164c9..5a73df2e13861 100644
--- a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
@@ -85,6 +85,11 @@ export interface IEmbeddable<
*/
enhancements?: object;
+ /**
+ * If this embeddable has encountered a fatal error, that error will be stored here
+ **/
+ fatalError?: Error;
+
/**
* A functional representation of the isContainer variable, but helpful for typescript to
* know the shape if this returns true
diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
index 1cd48e85469fd..4a1fd22894e7e 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
@@ -50,7 +50,7 @@ import { EditPanelAction } from '../actions';
import { CustomizePanelModal } from './panel_header/panel_actions/customize_title/customize_panel_modal';
import { EmbeddableStart } from '../../plugin';
import { EmbeddableErrorLabel } from './embeddable_error_label';
-import { EmbeddableStateTransfer } from '..';
+import { EmbeddableStateTransfer, ErrorEmbeddable } from '..';
const sortByOrderField = (
{ order: orderA }: { order?: number },
@@ -85,6 +85,7 @@ interface State {
notifications: Array>;
loading?: boolean;
error?: EmbeddableError;
+ errorEmbeddable?: ErrorEmbeddable;
}
interface PanelUniversalActions {
@@ -199,6 +200,9 @@ export class EmbeddablePanel extends React.Component {
if (this.parentSubscription) {
this.parentSubscription.unsubscribe();
}
+ if (this.state.errorEmbeddable) {
+ this.state.errorEmbeddable.destroy();
+ }
this.props.embeddable.destroy();
}
@@ -257,12 +261,21 @@ export class EmbeddablePanel extends React.Component {
public componentDidMount() {
if (this.embeddableRoot.current) {
this.subscription.add(
- this.props.embeddable.getOutput$().subscribe((output: EmbeddableOutput) => {
- this.setState({
- error: output.error,
- loading: output.loading,
- });
- })
+ this.props.embeddable.getOutput$().subscribe(
+ (output: EmbeddableOutput) => {
+ this.setState({
+ error: output.error,
+ loading: output.loading,
+ });
+ },
+ (error) => {
+ if (this.embeddableRoot.current) {
+ const errorEmbeddable = new ErrorEmbeddable(error, { id: this.props.embeddable.id });
+ errorEmbeddable.render(this.embeddableRoot.current);
+ this.setState({ errorEmbeddable });
+ }
+ }
+ )
);
this.props.embeddable.render(this.embeddableRoot.current);
}
diff --git a/src/plugins/embeddable/public/public.api.md b/src/plugins/embeddable/public/public.api.md
index 8f0f56c4e1a16..4406dded98547 100644
--- a/src/plugins/embeddable/public/public.api.md
+++ b/src/plugins/embeddable/public/public.api.md
@@ -278,6 +278,8 @@ export abstract class Embeddable>;
// (undocumented)
getInput(): Readonly;
@@ -298,6 +300,8 @@ export abstract class Embeddable {
destroy(): void;
enhancements?: object;
+ fatalError?: Error;
getInput$(): Readonly>;
getInput(): Readonly;
getInspectorAdapters(): Adapters | undefined;
diff --git a/src/plugins/expressions/common/execution/execution.ts b/src/plugins/expressions/common/execution/execution.ts
index ba115a7538604..50a469c338d73 100644
--- a/src/plugins/expressions/common/execution/execution.ts
+++ b/src/plugins/expressions/common/execution/execution.ts
@@ -22,8 +22,7 @@ import { keys, last, mapValues, reduce, zipObject } from 'lodash';
import { Executor } from '../executor';
import { createExecutionContainer, ExecutionContainer } from './container';
import { createError } from '../util';
-import { Defer, now } from '../../../kibana_utils/common';
-import { toPromise } from '../../../data/common/utils/abort_utils';
+import { abortSignalToPromise, Defer, now } from '../../../kibana_utils/common';
import { RequestAdapter, DataAdapter, Adapters } from '../../../inspector/common';
import { isExpressionValueError, ExpressionValueError } from '../expression_types/specs/error';
import {
@@ -93,7 +92,7 @@ export class Execution<
/**
* Promise that rejects if/when abort controller sends "abort" signal.
*/
- private readonly abortRejection = toPromise(this.abortController.signal);
+ private readonly abortRejection = abortSignalToPromise(this.abortController.signal);
/**
* Races a given promise against the "abort" event of `abortController`.
diff --git a/src/plugins/expressions/common/execution/types.ts b/src/plugins/expressions/common/execution/types.ts
index 50475c3bd94ae..abe3e08fc20c2 100644
--- a/src/plugins/expressions/common/execution/types.ts
+++ b/src/plugins/expressions/common/execution/types.ts
@@ -17,16 +17,18 @@
* under the License.
*/
-import { ExpressionType } from '../expression_types';
+import { ExpressionType, SerializableState } from '../expression_types';
import { Adapters, DataAdapter, RequestAdapter } from '../../../inspector/common';
-import { TimeRange, Query, Filter } from '../../../data/common';
import { SavedObject, SavedObjectAttributes } from '../../../../core/public';
/**
* `ExecutionContext` is an object available to all functions during a single execution;
* it provides various methods to perform side-effects.
*/
-export interface ExecutionContext {
+export interface ExecutionContext<
+ InspectorAdapters extends Adapters = Adapters,
+ ExecutionContextSearch extends SerializableState = SerializableState
+> {
/**
* Get search context of the expression.
*/
@@ -79,9 +81,3 @@ export interface DefaultInspectorAdapters extends Adapters {
requests: RequestAdapter;
data: DataAdapter;
}
-
-export interface ExecutionContextSearch {
- filters?: Filter[];
- query?: Query | Query[];
- timeRange?: TimeRange;
-}
diff --git a/src/plugins/expressions/common/expression_functions/specs/index.ts b/src/plugins/expressions/common/expression_functions/specs/index.ts
index 11706f65dbd32..10ccd014fd7bd 100644
--- a/src/plugins/expressions/common/expression_functions/specs/index.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/index.ts
@@ -19,8 +19,6 @@
import { clog } from './clog';
import { font } from './font';
-import { kibana } from './kibana';
-import { kibanaContextFunction } from './kibana_context';
import { variableSet } from './var_set';
import { variable } from './var';
import { AnyExpressionFunctionDefinition } from '../types';
@@ -32,8 +30,6 @@ import { movingAverage } from './moving_average';
export const functionSpecs: AnyExpressionFunctionDefinition[] = [
clog,
font,
- kibana,
- kibanaContextFunction,
variableSet,
variable,
theme,
@@ -44,8 +40,6 @@ export const functionSpecs: AnyExpressionFunctionDefinition[] = [
export * from './clog';
export * from './font';
-export * from './kibana';
-export * from './kibana_context';
export * from './var_set';
export * from './var';
export * from './theme';
diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/var.test.ts b/src/plugins/expressions/common/expression_functions/specs/tests/var.test.ts
index 762f34e3f5566..efcb5555cc63b 100644
--- a/src/plugins/expressions/common/expression_functions/specs/tests/var.test.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/tests/var.test.ts
@@ -20,12 +20,11 @@
import { functionWrapper } from './utils';
import { variable } from '../var';
import { ExecutionContext } from '../../../execution/types';
-import { KibanaContext } from '../../../expression_types';
describe('expression_functions', () => {
describe('var', () => {
const fn = functionWrapper(variable);
- let input: Partial;
+ let input: Partial>;
let context: ExecutionContext;
beforeEach(() => {
diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/var_set.test.ts b/src/plugins/expressions/common/expression_functions/specs/tests/var_set.test.ts
index 365ae5b89baea..17d9c4ab98c1a 100644
--- a/src/plugins/expressions/common/expression_functions/specs/tests/var_set.test.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/tests/var_set.test.ts
@@ -20,12 +20,11 @@
import { functionWrapper } from './utils';
import { variableSet } from '../var_set';
import { ExecutionContext } from '../../../execution/types';
-import { KibanaContext } from '../../../expression_types';
describe('expression_functions', () => {
describe('var_set', () => {
const fn = functionWrapper(variableSet);
- let input: Partial;
+ let input: Partial>;
let context: ExecutionContext;
let variables: Record;
diff --git a/src/plugins/expressions/common/expression_functions/types.ts b/src/plugins/expressions/common/expression_functions/types.ts
index 4a93cfa9211ff..52e4b4d9facf3 100644
--- a/src/plugins/expressions/common/expression_functions/types.ts
+++ b/src/plugins/expressions/common/expression_functions/types.ts
@@ -24,8 +24,6 @@ import { ExecutionContext } from '../execution/types';
import {
ExpressionFunctionClog,
ExpressionFunctionFont,
- ExpressionFunctionKibanaContext,
- ExpressionFunctionKibana,
ExpressionFunctionVarSet,
ExpressionFunctionVar,
ExpressionFunctionTheme,
@@ -129,8 +127,6 @@ export type AnyExpressionFunctionDefinition = ExpressionFunctionDefinition<
export interface ExpressionFunctionDefinitions {
clog: ExpressionFunctionClog;
font: ExpressionFunctionFont;
- kibana_context: ExpressionFunctionKibanaContext;
- kibana: ExpressionFunctionKibana;
var_set: ExpressionFunctionVarSet;
var: ExpressionFunctionVar;
theme: ExpressionFunctionTheme;
diff --git a/src/plugins/expressions/common/expression_types/specs/index.ts b/src/plugins/expressions/common/expression_types/specs/index.ts
index 00c52a2545cd6..ec8dee1f7fc52 100644
--- a/src/plugins/expressions/common/expression_types/specs/index.ts
+++ b/src/plugins/expressions/common/expression_types/specs/index.ts
@@ -22,7 +22,6 @@ import { datatable } from './datatable';
import { error } from './error';
import { filter } from './filter';
import { image } from './image';
-import { kibanaContext } from './kibana_context';
import { nullType } from './null';
import { num } from './num';
import { number } from './number';
@@ -40,7 +39,6 @@ export const typeSpecs: AnyExpressionTypeDefinition[] = [
error,
filter,
image,
- kibanaContext,
nullType,
num,
number,
@@ -57,7 +55,6 @@ export * from './datatable';
export * from './error';
export * from './filter';
export * from './image';
-export * from './kibana_context';
export * from './null';
export * from './num';
export * from './number';
diff --git a/src/plugins/expressions/common/service/expressions_services.ts b/src/plugins/expressions/common/service/expressions_services.ts
index 01289ca1ae57a..c9cc0680360bb 100644
--- a/src/plugins/expressions/common/service/expressions_services.ts
+++ b/src/plugins/expressions/common/service/expressions_services.ts
@@ -26,7 +26,6 @@ import { AnyExpressionFunctionDefinition } from '../expression_functions';
import { SavedObjectReference } from '../../../../core/types';
import { PersistableStateService, SerializableState } from '../../../kibana_utils/common';
import { Adapters } from '../../../inspector/common/adapters';
-import { ExecutionContextSearch } from '../execution';
/**
* The public contract that `ExpressionsService` provides to other plugins
@@ -48,7 +47,7 @@ export type ExpressionsServiceSetup = Pick<
>;
export interface ExpressionExecutionParams {
- searchContext?: ExecutionContextSearch;
+ searchContext?: SerializableState;
variables?: Record;
diff --git a/src/plugins/expressions/kibana.json b/src/plugins/expressions/kibana.json
index 67bbf4b6e5454..23c7fe722fdb3 100644
--- a/src/plugins/expressions/kibana.json
+++ b/src/plugins/expressions/kibana.json
@@ -6,7 +6,6 @@
"extraPublicDirs": ["common", "common/fonts"],
"requiredBundles": [
"kibanaUtils",
- "inspector",
- "data"
+ "inspector"
]
}
diff --git a/src/plugins/expressions/public/index.ts b/src/plugins/expressions/public/index.ts
index 893d68238747d..385055bc2fdc2 100644
--- a/src/plugins/expressions/public/index.ts
+++ b/src/plugins/expressions/public/index.ts
@@ -66,7 +66,6 @@ export {
ExpressionFunction,
ExpressionFunctionDefinition,
ExpressionFunctionDefinitions,
- ExpressionFunctionKibana,
ExpressionFunctionParameter,
ExpressionImage,
ExpressionRenderDefinition,
@@ -81,7 +80,6 @@ export {
ExpressionValueError,
ExpressionValueNum,
ExpressionValueRender,
- ExpressionValueSearchContext,
ExpressionValueUnboxed,
ExpressionValueFilter,
Font,
@@ -96,8 +94,6 @@ export {
InterpreterErrorType,
IRegistry,
isExpressionAstBuilder,
- KIBANA_CONTEXT_NAME,
- KibanaContext,
KnownTypeToString,
Overflow,
parse,
diff --git a/src/plugins/expressions/public/plugin.test.ts b/src/plugins/expressions/public/plugin.test.ts
index d9dde1f6def68..0b21fe354d3d3 100644
--- a/src/plugins/expressions/public/plugin.test.ts
+++ b/src/plugins/expressions/public/plugin.test.ts
@@ -50,14 +50,6 @@ describe('ExpressionsPublicPlugin', () => {
const bar = await setup.run('var_set name="foo" value="bar" | var name="foo"', null);
expect(bar).toBe('bar');
});
-
- test('kibana_context function is available', async () => {
- const { setup } = await expressionsPluginMock.createPlugin();
- const result = await setup.run('kibana_context', null);
- expect(result).toMatchObject({
- type: 'kibana_context',
- });
- });
});
});
@@ -81,15 +73,6 @@ describe('ExpressionsPublicPlugin', () => {
}
`);
});
-
- test('"kibana" function return value of type "kibana_context"', async () => {
- const { doStart } = await expressionsPluginMock.createPlugin();
- const start = await doStart();
- const execution = start.execute('kibana', null);
- const result = await execution.getData();
-
- expect((result as any).type).toBe('kibana_context');
- });
});
});
});
diff --git a/src/plugins/expressions/public/public.api.md b/src/plugins/expressions/public/public.api.md
index e6bff703aadcd..17f8e6255f6bb 100644
--- a/src/plugins/expressions/public/public.api.md
+++ b/src/plugins/expressions/public/public.api.md
@@ -130,15 +130,15 @@ export class Execution = StateContainer, ExecutionPureTransitions
{title}
-
-
- {highlightMsg && (
-
-
- - {highlightMsg} -
- )} -{description}
-