From 0c7aefa8f5090fb76282dc57a61e8bcc6747376c Mon Sep 17 00:00:00 2001
From: Zacqary Xeper <zacqary.xeper@elastic.co>
Date: Tue, 28 Apr 2020 11:19:50 -0500
Subject: [PATCH] Fix parsing empty query

---
 .../metric_threshold_executor.ts              | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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
index 85dea52db89e88..9d694f6b8f7d79 100644
--- 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
@@ -51,17 +51,19 @@ const getCurrentValueFromAggregations = (
 
 const getParsedFilterQuery: (
   filterQuery: string | undefined
-) => Record<string, any> = filterQuery => {
-  if (!filterQuery) return {};
+) => Array<Record<string, any>> = filterQuery => {
+  if (!filterQuery) return [];
   try {
-    return JSON.parse(filterQuery).bool;
+    return [JSON.parse(filterQuery).bool];
   } catch (e) {
-    return {
-      query_string: {
-        query: filterQuery,
-        analyze_wildcard: true,
+    return [
+      {
+        query_string: {
+          query: filterQuery,
+          analyze_wildcard: true,
+        },
       },
-    };
+    ];
   }
 };
 
@@ -159,7 +161,7 @@ export const getElasticsearchMetricQuery = (
   return {
     query: {
       bool: {
-        filter: [...rangeFilters, ...metricFieldFilters, parsedFilterQuery],
+        filter: [...rangeFilters, ...metricFieldFilters, ...parsedFilterQuery],
       },
     },
     size: 0,