Fix tests

elastic · Mar 19, 2020 · f852ae2 · f852ae2
1 parent c8af703
commit f852ae2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
@@ -17,7 +17,7 @@ const alertInstances = new Map();
 
 const services = {
   callCluster(_: string, { body }: any) {
-    const metric = body.query.bool.filter[1].exists.field;
+    const metric = body.query.bool.filter[1]?.exists.field;
     if (body.aggs.groupings) {
       if (body.aggs.groupings.composite.after) {
         return mocks.compositeEndResponse;

diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
@@ -135,12 +135,12 @@ export const getElasticsearchMetricQuery = (
     : [];
 
   const parsedFilterQuery = getParsedFilterQuery(filterQuery);
-  const queryFilters = !isEmpty(parsedFilterQuery) ? [parsedFilterQuery] : [];
 
   return {
     query: {
       bool: {
-        filter: [...rangeFilters, ...metricFieldFilters, ...queryFilters],
+        filter: [...rangeFilters, ...metricFieldFilters],
+        ...parsedFilterQuery,
       },
     },
     size: 0,