From 398648595280e401654371125e1636aa388bee75 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alisonmllr20@gmail.com>
Date: Tue, 14 Jul 2020 11:56:00 -0400
Subject: [PATCH] adopt data stream API changes

---
 x-pack/plugins/index_management/common/types/templates.ts   | 4 ++--
 .../components/template_form/template_form_schemas.tsx      | 6 +++---
 .../apis/management/index_management/data_streams.ts        | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/index_management/common/types/templates.ts b/x-pack/plugins/index_management/common/types/templates.ts
index 32e254e490b2aa..eda00ec8191592 100644
--- a/x-pack/plugins/index_management/common/types/templates.ts
+++ b/x-pack/plugins/index_management/common/types/templates.ts
@@ -22,7 +22,7 @@ export interface TemplateSerialized {
   version?: number;
   priority?: number;
   _meta?: { [key: string]: any };
-  data_stream?: { timestamp_field: string };
+  data_stream?: {};
 }
 
 /**
@@ -46,7 +46,7 @@ export interface TemplateDeserialized {
     name: string;
   };
   _meta?: { [key: string]: any }; // Composable template only
-  dataStream?: { timestamp_field: string }; // Composable template only
+  dataStream?: {}; // Composable template only
   _kbnMeta: {
     type: TemplateType;
     hasDatastream: boolean;
diff --git a/x-pack/plugins/index_management/public/application/components/template_form/template_form_schemas.tsx b/x-pack/plugins/index_management/public/application/components/template_form/template_form_schemas.tsx
index d8c3ad8c259fcf..0c8c047ba4458d 100644
--- a/x-pack/plugins/index_management/public/application/components/template_form/template_form_schemas.tsx
+++ b/x-pack/plugins/index_management/public/application/components/template_form/template_form_schemas.tsx
@@ -136,9 +136,9 @@ export const schemas: Record<string, FormSchema> = {
       defaultValue: false,
       serializer: (value) => {
         if (value === true) {
-          return {
-            timestamp_field: '@timestamp',
-          };
+          // For now, ES expects an empty empty when defining a data stream
+          // https://github.com/elastic/elasticsearch/pull/59317
+          return {};
         }
       },
       deserializer: (value) => {
diff --git a/x-pack/test/api_integration/apis/management/index_management/data_streams.ts b/x-pack/test/api_integration/apis/management/index_management/data_streams.ts
index 0fe5dab1af52d0..f8ddca374209bd 100644
--- a/x-pack/test/api_integration/apis/management/index_management/data_streams.ts
+++ b/x-pack/test/api_integration/apis/management/index_management/data_streams.ts
@@ -35,9 +35,7 @@ export default function ({ getService }: FtrProviderContext) {
             },
           },
         },
-        data_stream: {
-          timestamp_field: '@timestamp',
-        },
+        data_stream: {},
       },
     });