Add epoch_millis format type to query builder

elastic · Feb 16, 2023 · 89082fb · 89082fb
1 parent 2c1e9fd
commit 89082fb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/x-pack/plugins/stack_alerts/common/build_sorted_events_query.test.ts b/x-pack/plugins/stack_alerts/common/build_sorted_events_query.test.ts
@@ -63,6 +63,7 @@ describe('buildSortedEventsQuery', () => {
         sort: [
           {
             timefield: {
+              format: 'strict_date_optional_time||epoch_millis',
               order: 'asc',
             },
           },
@@ -111,6 +112,7 @@ describe('buildSortedEventsQuery', () => {
         sort: [
           {
             timefield: {
+              format: 'strict_date_optional_time||epoch_millis',
               order: 'asc',
             },
           },
@@ -160,6 +162,7 @@ describe('buildSortedEventsQuery', () => {
         sort: [
           {
             timefield: {
+              format: 'strict_date_optional_time||epoch_millis',
               order: 'asc',
             },
           },
@@ -210,6 +213,7 @@ describe('buildSortedEventsQuery', () => {
         sort: [
           {
             timefield: {
+              format: 'strict_date_optional_time||epoch_millis',
               order: 'asc',
             },
           },
@@ -272,6 +276,7 @@ describe('buildSortedEventsQuery', () => {
         sort: [
           {
             timefield: {
+              format: 'strict_date_optional_time||epoch_millis',
               order: 'asc',
             },
           },
@@ -320,6 +325,7 @@ describe('buildSortedEventsQuery', () => {
         sort: [
           {
             timefield: {
+              format: 'strict_date_optional_time||epoch_millis',
               order: 'desc',
             },
           },
@@ -368,6 +374,7 @@ describe('buildSortedEventsQuery', () => {
         sort: [
           {
             timefield: {
+              format: 'strict_date_optional_time||epoch_millis',
               order: 'asc',
             },
           },

diff --git a/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts b/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts
@@ -80,6 +80,7 @@ export const buildSortedEventsQuery = ({
         {
           [sortField]: {
             order: sortOrder ?? 'asc',
+            format: 'strict_date_optional_time||epoch_millis',
           },
         },
       ],

diff --git a/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_search_source_query.ts b/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_search_source_query.ts
@@ -129,7 +129,14 @@ export function updateSearchSource(
 
   const searchSourceChild = searchSource.createChild();
   searchSourceChild.setField('filter', filters as Filter[]);
-  searchSourceChild.setField('sort', [{ [timeFieldName]: SortDirection.desc }]);
+  searchSourceChild.setField('sort', [
+    {
+      [timeFieldName]: {
+        order: SortDirection.desc,
+        format: 'strict_date_optional_time||epoch_millis',
+      },
+    },
+  ]);
   searchSourceChild.setField(
     'aggs',
     buildAggregation({
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,6 +80,7 @@ export const buildSortedEventsQuery = ({ @@
             {
               [sortField]: {
                 order: sortOrder ?? 'asc',
+                format: 'strict_date_optional_time||epoch_millis',
               },
             },
           ],
@@ Expand Down @@