Merge branch 'master' of github.com:elastic/kibana into severity_column

elastic · Aug 18, 2021 · 87c3ce6 · 87c3ce6
2 parents 468892b + ed78d4b
commit 87c3ce6
Show file tree

Hide file tree

Showing 54 changed files with 217 additions and 678 deletions.
diff --git a/.../development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md b/.../development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md
@@ -28,7 +28,7 @@ esFilters: {
     isPhraseFilter: (filter: import("@kbn/es-query").FieldFilter) => filter is import("@kbn/es-query").PhraseFilter;
     isExistsFilter: (filter: import("@kbn/es-query").FieldFilter) => filter is import("@kbn/es-query").ExistsFilter;
     isPhrasesFilter: (filter: import("@kbn/es-query").FieldFilter) => filter is import("@kbn/es-query").PhrasesFilter;
-    isRangeFilter: (filter?: import("@kbn/es-query").ExistsFilter | import("@kbn/es-query").GeoPolygonFilter | import("@kbn/es-query").PhrasesFilter | import("@kbn/es-query").PhraseFilter | import("@kbn/es-query").MatchAllFilter | import("@kbn/es-query").MissingFilter | import("@kbn/es-query").RangeFilter | import("@kbn/es-query").GeoBoundingBoxFilter | undefined) => filter is import("@kbn/es-query").RangeFilter;
+    isRangeFilter: (filter?: import("@kbn/es-query").ExistsFilter | import("@kbn/es-query").PhrasesFilter | import("@kbn/es-query").PhraseFilter | import("@kbn/es-query").MatchAllFilter | import("@kbn/es-query").MissingFilter | import("@kbn/es-query").RangeFilter | undefined) => filter is import("@kbn/es-query").RangeFilter;
     isMatchAllFilter: (filter: import("@kbn/es-query").FieldFilter) => filter is import("@kbn/es-query").MatchAllFilter;
     isMissingFilter: (filter: import("@kbn/es-query").FieldFilter) => filter is import("@kbn/es-query").MissingFilter;
     isQueryStringFilter: (filter: import("@kbn/es-query").FieldFilter) => filter is import("@kbn/es-query/target_types/filters/build_filters").QueryStringFilter;

diff --git a/packages/kbn-es-query/src/filters/build_filters/geo_bounding_box_filter.test.ts b/packages/kbn-es-query/src/filters/build_filters/geo_bounding_box_filter.test.ts
diff --git a/packages/kbn-es-query/src/filters/build_filters/geo_bounding_box_filter.ts b/packages/kbn-es-query/src/filters/build_filters/geo_bounding_box_filter.ts
diff --git a/packages/kbn-es-query/src/filters/build_filters/geo_polygon_filter.test.ts b/packages/kbn-es-query/src/filters/build_filters/geo_polygon_filter.test.ts
diff --git a/packages/kbn-es-query/src/filters/build_filters/geo_polygon_filter.ts b/packages/kbn-es-query/src/filters/build_filters/geo_polygon_filter.ts
diff --git a/packages/kbn-es-query/src/filters/build_filters/get_filter_field.ts b/packages/kbn-es-query/src/filters/build_filters/get_filter_field.ts
@@ -7,8 +7,6 @@
  */
 
 import { getExistsFilterField, isExistsFilter } from './exists_filter';
-import { getGeoBoundingBoxFilterField, isGeoBoundingBoxFilter } from './geo_bounding_box_filter';
-import { getGeoPolygonFilterField, isGeoPolygonFilter } from './geo_polygon_filter';
 import { getMissingFilterField, isMissingFilter } from './missing_filter';
 import { getPhrasesFilterField, isPhrasesFilter } from './phrases_filter';
 import { getPhraseFilterField, isPhraseFilter } from './phrase_filter';
@@ -20,12 +18,6 @@ export const getFilterField = (filter: Filter) => {
   if (isExistsFilter(filter)) {
     return getExistsFilterField(filter);
   }
-  if (isGeoBoundingBoxFilter(filter)) {
-    return getGeoBoundingBoxFilterField(filter);
-  }
-  if (isGeoPolygonFilter(filter)) {
-    return getGeoPolygonFilterField(filter);
-  }
   if (isPhraseFilter(filter)) {
     return getPhraseFilterField(filter);
   }

diff --git a/packages/kbn-es-query/src/filters/build_filters/index.ts b/packages/kbn-es-query/src/filters/build_filters/index.ts
@@ -11,8 +11,6 @@ export * from './build_filters';
 export * from './build_empty_filter';
 export * from './custom_filter';
 export * from './exists_filter';
-export * from './geo_bounding_box_filter';
-export * from './geo_polygon_filter';
 export * from './get_filter_field';
 export * from './get_filter_params';
 export * from './match_all_filter';

diff --git a/packages/kbn-es-query/src/filters/build_filters/types.ts b/packages/kbn-es-query/src/filters/build_filters/types.ts
@@ -7,8 +7,6 @@
  */
 
 import { ExistsFilter } from './exists_filter';
-import { GeoBoundingBoxFilter } from './geo_bounding_box_filter';
-import { GeoPolygonFilter } from './geo_polygon_filter';
 import { PhrasesFilter } from './phrases_filter';
 import { PhraseFilter } from './phrase_filter';
 import { RangeFilter } from './range_filter';
@@ -21,8 +19,6 @@ import { MissingFilter } from './missing_filter';
  **/
 export type FieldFilter =
   | ExistsFilter
-  | GeoBoundingBoxFilter
-  | GeoPolygonFilter
   | PhraseFilter
   | PhrasesFilter
   | RangeFilter
@@ -49,8 +45,6 @@ export enum FILTERS {
   QUERY_STRING = 'query_string',
   RANGE = 'range',
   RANGE_FROM_VALUE = 'range_from_value',
-  GEO_BOUNDING_BOX = 'geo_bounding_box',
-  GEO_POLYGON = 'geo_polygon',
   SPATIAL_FILTER = 'spatial_filter',
 }
 

diff --git a/packages/kbn-es-query/src/filters/index.ts b/packages/kbn-es-query/src/filters/index.ts
@@ -30,8 +30,6 @@ export {
 export {
   isExistsFilter,
   isMatchAllFilter,
-  isGeoBoundingBoxFilter,
-  isGeoPolygonFilter,
   isMissingFilter,
   isPhraseFilter,
   isPhrasesFilter,
@@ -67,11 +65,9 @@ export {
   PhraseFilter,
   PhrasesFilter,
   RangeFilterMeta,
-  GeoPolygonFilter,
   MatchAllFilter,
   CustomFilter,
   MissingFilter,
-  GeoBoundingBoxFilter,
   RangeFilterParams,
 } from './build_filters';
 

diff --git a/packages/kbn-rule-data-utils/src/technical_field_names.ts b/packages/kbn-rule-data-utils/src/technical_field_names.ts
@@ -47,7 +47,6 @@ const ALERT_RULE_CREATED_BY = `${ALERT_RULE_NAMESPACE}.created_by` as const;
 const ALERT_RULE_DESCRIPTION = `${ALERT_RULE_NAMESPACE}.description` as const;
 const ALERT_RULE_ENABLED = `${ALERT_RULE_NAMESPACE}.enabled` as const;
 const ALERT_RULE_FROM = `${ALERT_RULE_NAMESPACE}.from` as const;
-const ALERT_RULE_ID = `${ALERT_RULE_NAMESPACE}.id` as const;
 const ALERT_RULE_INTERVAL = `${ALERT_RULE_NAMESPACE}.interval` as const;
 const ALERT_RULE_LICENSE = `${ALERT_RULE_NAMESPACE}.license` as const;
 const ALERT_RULE_CATEGORY = `${ALERT_RULE_NAMESPACE}.category` as const;
@@ -106,7 +105,6 @@ const fields = {
   ALERT_RULE_DESCRIPTION,
   ALERT_RULE_ENABLED,
   ALERT_RULE_FROM,
-  ALERT_RULE_ID,
   ALERT_RULE_INTERVAL,
   ALERT_RULE_LICENSE,
   ALERT_RULE_NAME,
@@ -162,7 +160,6 @@ export {
   ALERT_RULE_DESCRIPTION,
   ALERT_RULE_ENABLED,
   ALERT_RULE_FROM,
-  ALERT_RULE_ID,
   ALERT_RULE_INTERVAL,
   ALERT_RULE_LICENSE,
   ALERT_RULE_NAME,

diff --git a/src/plugins/data/common/es_query/index.ts b/src/plugins/data/common/es_query/index.ts
@@ -29,8 +29,6 @@ import {
   isFilters as oldIsFilters,
   isExistsFilter as oldIsExistsFilter,
   isMatchAllFilter as oldIsMatchAllFilter,
-  isGeoBoundingBoxFilter as oldIsGeoBoundingBoxFilter,
-  isGeoPolygonFilter as oldIsGeoPolygonFilter,
   isMissingFilter as oldIsMissingFilter,
   isPhraseFilter as oldIsPhraseFilter,
   isPhrasesFilter as oldIsPhrasesFilter,
@@ -49,14 +47,12 @@ import {
   RangeFilterMeta as oldRangeFilterMeta,
   RangeFilterParams as oldRangeFilterParams,
   ExistsFilter as oldExistsFilter,
-  GeoPolygonFilter as oldGeoPolygonFilter,
   PhrasesFilter as oldPhrasesFilter,
   PhraseFilter as oldPhraseFilter,
   MatchAllFilter as oldMatchAllFilter,
   CustomFilter as oldCustomFilter,
   MissingFilter as oldMissingFilter,
   RangeFilter as oldRangeFilter,
-  GeoBoundingBoxFilter as oldGeoBoundingBoxFilter,
   KueryNode as oldKueryNode,
   FilterMeta as oldFilterMeta,
   FILTERS as oldFILTERS,
@@ -176,18 +172,6 @@ const isExistsFilter = oldIsExistsFilter;
  */
 const isMatchAllFilter = oldIsMatchAllFilter;
 
-/**
- * @deprecated Import from the "@kbn/es-query" package directly instead.
- * @removeBy 8.1
- */
-const isGeoBoundingBoxFilter = oldIsGeoBoundingBoxFilter;
-
-/**
- * @deprecated Import from the "@kbn/es-query" package directly instead.
- * @removeBy 8.1
- */
-const isGeoPolygonFilter = oldIsGeoPolygonFilter;
-
 /**
  * @deprecated Import from the "@kbn/es-query" package directly instead.
  * @removeBy 8.1
@@ -338,12 +322,6 @@ type RangeFilterParams = oldRangeFilterParams;
  */
 type ExistsFilter = oldExistsFilter;
 
-/**
- * @deprecated Import from the "@kbn/es-query" package directly instead.
- * @removeBy 8.1
- */
-type GeoPolygonFilter = oldGeoPolygonFilter;
-
 /**
  * @deprecated Import from the "@kbn/es-query" package directly instead.
  * @removeBy 8.1
@@ -380,12 +358,6 @@ type MissingFilter = oldMissingFilter;
  */
 type RangeFilter = oldRangeFilter;
 
-/**
- * @deprecated Import from the "@kbn/es-query" package directly instead.
- * @removeBy 8.1
- */
-type GeoBoundingBoxFilter = oldGeoBoundingBoxFilter;
-
 /**
  * @deprecated Import from the "@kbn/es-query" package directly instead.
  * @removeBy 8.1
@@ -436,8 +408,6 @@ export {
   isFilters,
   isExistsFilter,
   isMatchAllFilter,
-  isGeoBoundingBoxFilter,
-  isGeoPolygonFilter,
   isMissingFilter,
   isPhraseFilter,
   isPhrasesFilter,
@@ -463,14 +433,12 @@ export {
   RangeFilterMeta,
   RangeFilterParams,
   ExistsFilter,
-  GeoPolygonFilter,
   PhrasesFilter,
   PhraseFilter,
   MatchAllFilter,
   CustomFilter,
   MissingFilter,
   RangeFilter,
-  GeoBoundingBoxFilter,
   KueryNode,
   FilterMeta,
   IFieldSubType,

diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
@@ -748,7 +748,7 @@ export const esFilters: {
     isPhraseFilter: (filter: import("@kbn/es-query").FieldFilter) => filter is import("@kbn/es-query").PhraseFilter;
     isExistsFilter: (filter: import("@kbn/es-query").FieldFilter) => filter is import("@kbn/es-query").ExistsFilter;
     isPhrasesFilter: (filter: import("@kbn/es-query").FieldFilter) => filter is import("@kbn/es-query").PhrasesFilter;
-    isRangeFilter: (filter?: import("@kbn/es-query").ExistsFilter | import("@kbn/es-query").GeoPolygonFilter | import("@kbn/es-query").PhrasesFilter | import("@kbn/es-query").PhraseFilter | import("@kbn/es-query").MatchAllFilter | import("@kbn/es-query").MissingFilter | import("@kbn/es-query").RangeFilter | import("@kbn/es-query").GeoBoundingBoxFilter | undefined) => filter is import("@kbn/es-query").RangeFilter;
+    isRangeFilter: (filter?: import("@kbn/es-query").ExistsFilter | import("@kbn/es-query").PhrasesFilter | import("@kbn/es-query").PhraseFilter | import("@kbn/es-query").MatchAllFilter | import("@kbn/es-query").MissingFilter | import("@kbn/es-query").RangeFilter | undefined) => filter is import("@kbn/es-query").RangeFilter;
     isMatchAllFilter: (filter: import("@kbn/es-query").FieldFilter) => filter is import("@kbn/es-query").MatchAllFilter;
     isMissingFilter: (filter: import("@kbn/es-query").FieldFilter) => filter is import("@kbn/es-query").MissingFilter;
     isQueryStringFilter: (filter: import("@kbn/es-query").FieldFilter) => filter is import("@kbn/es-query/target_types/filters/build_filters").QueryStringFilter;

diff --git a/src/plugins/data/public/query/filter_manager/lib/map_filter.ts b/src/plugins/data/public/query/filter_manager/lib/map_filter.ts
@@ -17,8 +17,6 @@ import { mapRange } from './mappers/map_range';
 import { mapExists } from './mappers/map_exists';
 import { mapMissing } from './mappers/map_missing';
 import { mapQueryString } from './mappers/map_query_string';
-import { mapGeoBoundingBox } from './mappers/map_geo_bounding_box';
-import { mapGeoPolygon } from './mappers/map_geo_polygon';
 import { mapDefault } from './mappers/map_default';
 import { generateMappingChain } from './generate_mapping_chain';
 
@@ -48,8 +46,6 @@ export function mapFilter(filter: Filter) {
     mapExists,
     mapMissing,
     mapQueryString,
-    mapGeoBoundingBox,
-    mapGeoPolygon,
     mapDefault,
   ];