From b4c69c48b82c6599b4456a74b054a28b37a00229 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:35:47 -0500
Subject: [PATCH] [8.7] Add date_nanos support to Time field (#151374)
 (#151724)

# Backport

This will backport the following commits from `main` to `8.7`:
- [Add date_nanos support to Time field
(#151374)](https://github.com/elastic/kibana/pull/151374)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Ersin
Erdal","email":"92688503+ersin-erdal@users.noreply.github.com"},"sourceCommit":{"committedDate":"2023-02-21T15:25:09Z","message":"Add
date_nanos support to Time field (#151374)\n\nFixes: #145855
\r\n\r\n`Time field` in rule update/create forms shows only the fields
with\r\n`date` data type. This PR adds `date_nanos` type as
well.\r\n\r\n## To verify:\r\n\r\n- Create an index that has fields with
`date` and `date_nanos` types.\r\n```\r\nPUT test-index-date\r\n{\r\n
\"mappings\": {\r\n \"properties\": {\r\n \"date\": {\r\n \"type\":
\"date\"\r\n },\r\n \"timestamp\": {\r\n \"type\": \"date_nanos\"\r\n
}\r\n }\r\n }\r\n}\r\n```\r\n- Add data with `date` and `date_nanos`
data types\r\nNote: You can
use\r\nhttps://www.site24x7.com/tools/time-stamp-converter.html address
to\r\ngenerate date_nanos timestamps with a date you
desired.\r\n```\r\nPUT test-index-date/_bulk?refresh\r\n{ \"index\" : {
\"_id\" : \"1\" } }\r\n{ \"date\": \"2023-02-15T18:00:00.000Z\",
\"timestamp\": 1676480400000} \r\n{ \"index\" : { \"_id\" : \"2\" }
}\r\n{ \"date\": \"2023-02-15T18:00:00.000Z\", \"timestamp\":
1676480400000 } \r\n```\r\n- Open a Rule create form and select
`Elasticsearch query`\r\n- Select `Query DSL`\r\n- Click on `select an
index`\r\n- Type the above index name (test-index-date) in `Indices to
query`\r\ninput\r\n- Select `timestamp` from time field\r\n- Click on
`Test Query` button and expect to see `Query matched 2\r\ndocuments in
the last
5m.`","sha":"58204cf2a0fd2b921d5f5c3e138b725bce1c5229","branchLabelMapping":{"^v8.8.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:ResponseOps","v8.7.0","v8.8.0"],"number":151374,"url":"https://github.com/elastic/kibana/pull/151374","mergeCommit":{"message":"Add
date_nanos support to Time field (#151374)\n\nFixes: #145855
\r\n\r\n`Time field` in rule update/create forms shows only the fields
with\r\n`date` data type. This PR adds `date_nanos` type as
well.\r\n\r\n## To verify:\r\n\r\n- Create an index that has fields with
`date` and `date_nanos` types.\r\n```\r\nPUT test-index-date\r\n{\r\n
\"mappings\": {\r\n \"properties\": {\r\n \"date\": {\r\n \"type\":
\"date\"\r\n },\r\n \"timestamp\": {\r\n \"type\": \"date_nanos\"\r\n
}\r\n }\r\n }\r\n}\r\n```\r\n- Add data with `date` and `date_nanos`
data types\r\nNote: You can
use\r\nhttps://www.site24x7.com/tools/time-stamp-converter.html address
to\r\ngenerate date_nanos timestamps with a date you
desired.\r\n```\r\nPUT test-index-date/_bulk?refresh\r\n{ \"index\" : {
\"_id\" : \"1\" } }\r\n{ \"date\": \"2023-02-15T18:00:00.000Z\",
\"timestamp\": 1676480400000} \r\n{ \"index\" : { \"_id\" : \"2\" }
}\r\n{ \"date\": \"2023-02-15T18:00:00.000Z\", \"timestamp\":
1676480400000 } \r\n```\r\n- Open a Rule create form and select
`Elasticsearch query`\r\n- Select `Query DSL`\r\n- Click on `select an
index`\r\n- Type the above index name (test-index-date) in `Indices to
query`\r\ninput\r\n- Select `timestamp` from time field\r\n- Click on
`Test Query` button and expect to see `Query matched 2\r\ndocuments in
the last
5m.`","sha":"58204cf2a0fd2b921d5f5c3e138b725bce1c5229"}},"sourceBranch":"main","suggestedTargetBranches":["8.7"],"targetPullRequestStates":[{"branch":"8.7","label":"v8.7.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.8.0","labelRegex":"^v8.8.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/151374","number":151374,"mergeCommit":{"message":"Add
date_nanos support to Time field (#151374)\n\nFixes: #145855
\r\n\r\n`Time field` in rule update/create forms shows only the fields
with\r\n`date` data type. This PR adds `date_nanos` type as
well.\r\n\r\n## To verify:\r\n\r\n- Create an index that has fields with
`date` and `date_nanos` types.\r\n```\r\nPUT test-index-date\r\n{\r\n
\"mappings\": {\r\n \"properties\": {\r\n \"date\": {\r\n \"type\":
\"date\"\r\n },\r\n \"timestamp\": {\r\n \"type\": \"date_nanos\"\r\n
}\r\n }\r\n }\r\n}\r\n```\r\n- Add data with `date` and `date_nanos`
data types\r\nNote: You can
use\r\nhttps://www.site24x7.com/tools/time-stamp-converter.html address
to\r\ngenerate date_nanos timestamps with a date you
desired.\r\n```\r\nPUT test-index-date/_bulk?refresh\r\n{ \"index\" : {
\"_id\" : \"1\" } }\r\n{ \"date\": \"2023-02-15T18:00:00.000Z\",
\"timestamp\": 1676480400000} \r\n{ \"index\" : { \"_id\" : \"2\" }
}\r\n{ \"date\": \"2023-02-15T18:00:00.000Z\", \"timestamp\":
1676480400000 } \r\n```\r\n- Open a Rule create form and select
`Elasticsearch query`\r\n- Select `Query DSL`\r\n- Click on `select an
index`\r\n- Type the above index name (test-index-date) in `Indices to
query`\r\ninput\r\n- Select `timestamp` from time field\r\n- Click on
`Test Query` button and expect to see `Query matched 2\r\ndocuments in
the last 5m.`","sha":"58204cf2a0fd2b921d5f5c3e138b725bce1c5229"}}]}]
BACKPORT-->

Co-authored-by: Ersin Erdal <92688503+ersin-erdal@users.noreply.github.com>
---
 .../common/build_sorted_events_query.test.ts             | 7 +++++++
 .../stack_alerts/common/build_sorted_events_query.ts     | 1 +
 .../rule_types/es_query/lib/fetch_es_query.test.ts       | 4 ++++
 .../rule_types/es_query/lib/fetch_search_source_query.ts | 9 ++++++++-
 .../public/common/lib/get_time_options.test.ts           | 6 +++++-
 .../public/common/lib/get_time_options.ts                | 2 +-
 6 files changed, 26 insertions(+), 3 deletions(-)

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
index bac84bd4a4b28..8e53736b23963 100644
--- 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
index 7b92374b8fb33..5253fb8eb74ee 100644
--- 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_es_query.test.ts b/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_es_query.test.ts
index 10e8278f1976a..193f559ce2d62 100644
--- a/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_es_query.test.ts
+++ b/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_es_query.test.ts
@@ -130,6 +130,7 @@ describe('fetchEsQuery', () => {
           sort: [
             {
               '@timestamp': {
+                format: 'strict_date_optional_time||epoch_millis',
                 order: 'desc',
               },
             },
@@ -194,6 +195,7 @@ describe('fetchEsQuery', () => {
           sort: [
             {
               '@timestamp': {
+                format: 'strict_date_optional_time||epoch_millis',
                 order: 'desc',
               },
             },
@@ -258,6 +260,7 @@ describe('fetchEsQuery', () => {
           sort: [
             {
               '@timestamp': {
+                format: 'strict_date_optional_time||epoch_millis',
                 order: 'desc',
               },
             },
@@ -349,6 +352,7 @@ describe('fetchEsQuery', () => {
           sort: [
             {
               '@timestamp': {
+                format: 'strict_date_optional_time||epoch_millis',
                 order: 'desc',
               },
             },
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
index 13f4a49796b6d..e033f9c6ef4a8 100644
--- 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({
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/get_time_options.test.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/get_time_options.test.ts
index 684253c5acdf5..83d6515bf7831 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/get_time_options.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/get_time_options.test.ts
@@ -31,8 +31,12 @@ describe('get_time_options', () => {
   test('if getTimeFieldOptions return only date type fields', () => {
     const timeOnlyTypeFields = getTimeFieldOptions([
       { type: 'date', name: 'order_date' },
+      { type: 'date_nanos', name: 'order_date_nanos' },
       { type: 'number', name: 'sum' },
     ]);
-    expect(timeOnlyTypeFields).toMatchObject([{ text: 'order_date', value: 'order_date' }]);
+    expect(timeOnlyTypeFields).toMatchObject([
+      { text: 'order_date', value: 'order_date' },
+      { text: 'order_date_nanos', value: 'order_date_nanos' },
+    ]);
   });
 });
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/get_time_options.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/get_time_options.ts
index 16a7a8db61301..c20a2385c12c9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/get_time_options.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/get_time_options.ts
@@ -27,7 +27,7 @@ export const getTimeFieldOptions = (
   const options: TimeFieldOptions[] = [];
 
   fields.forEach((field: { type: string; name: string }) => {
-    if (field.type === 'date') {
+    if (field.type === 'date' || field.type === 'date_nanos') {
       options.push({
         text: field.name,
         value: field.name,