Fix time filter in alerts table (elastic#142377)

WafaaNasr · Oct 11, 2022 · 3d181df · 3d181df
1 parent 68d80a2
commit 3d181df
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 3 deletions.
diff --git a/...ugins/observability/public/utils/build_es_query/__snapshots__/build_es_query.test.ts.snap b/...ugins/observability/public/utils/build_es_query/__snapshots__/build_es_query.test.ts.snap
diff --git a/x-pack/plugins/observability/public/utils/build_es_query/build_es_query.test.ts b/x-pack/plugins/observability/public/utils/build_es_query/build_es_query.test.ts
@@ -34,6 +34,13 @@ describe('buildEsQuery', () => {
       timeRange: defaultTimeRange,
       kuery: 'kibana.alert.status: "recovered" and kibana.alert.duration.us >= 120',
     },
+    {
+      timeRange: {
+        from: 'now-15min',
+        to: 'now',
+      },
+      kuery: 'kibana.alert.status: "recovered"',
+    },
   ];
 
   test.each(testData)('should generate correct es query for %j', ({ kuery, timeRange }) => {

diff --git a/x-pack/plugins/observability/public/utils/build_es_query/build_es_query.ts b/x-pack/plugins/observability/public/utils/build_es_query/build_es_query.ts
@@ -7,15 +7,15 @@
 
 import { buildEsQuery as kbnBuildEsQuery, TimeRange } from '@kbn/es-query';
 import { TIMESTAMP } from '@kbn/rule-data-utils';
-import { getTime } from '@kbn/data-plugin/common';
+import { getRelativeTime } from '@kbn/data-plugin/common';
 
 export function buildEsQuery(timeRange: TimeRange, kuery?: string) {
   const timeFilter =
     timeRange &&
-    getTime(undefined, timeRange, {
+    getRelativeTime(undefined, timeRange, {
       fieldName: TIMESTAMP,
     });
-  const filtersToUse = [...(timeFilter ? [timeFilter] : [])];
+  const filtersToUse = timeFilter ? [timeFilter] : [];
   const queryToUse = kuery ? { query: kuery, language: 'kuery' } : [];
 
   return kbnBuildEsQuery(undefined, queryToUse, filtersToUse);