Fix parsing empty query

elastic · Apr 28, 2020 · 0c7aefa · 0c7aefa
1 parent bfaf980
commit 0c7aefa
Showing 1 changed file with 11 additions and 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
@@ -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,