adopt data stream API changes

elastic · Jul 14, 2020 · 3986485 · 3986485
1 parent 54e09cd
commit 3986485
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git 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/...ns/index_management/public/application/components/template_form/template_form_schemas.tsx b/...ns/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
@@ -35,9 +35,7 @@ export default function ({ getService }: FtrProviderContext) {
  },
  },
  },
- data_stream: {
- timestamp_field: '@timestamp',
- },
+ data_stream: {},
  },
  });