Removes timestamp_field from data_stream (elastic#71727)

elastic#71670 Caused by elastic/elasticsearch#59317 Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
mistic · Jul 15, 2020 · 6068285 · 6068285
1 parent 99255d8
commit 6068285
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 29 deletions.
diff --git a/x-pack/plugins/ingest_manager/common/types/models/epm.ts b/x-pack/plugins/ingest_manager/common/types/models/epm.ts
@@ -276,9 +276,7 @@ export interface IndexTemplate {
  mappings: any;
  aliases: object;
  };
- data_stream: {
- timestamp_field: string;
- };
+ data_stream: object;
  composed_of: string[];
  _meta: object;
 }

diff --git a/...st_manager/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap b/...st_manager/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
@@ -308,9 +308,7 @@ function getBaseTemplate(
  // To be filled with the aliases that we need
  aliases: {},
  },
- data_stream: {
- timestamp_field: '@timestamp',
- },
+ data_stream: {},
  composed_of: composedOfTemplates,
  _meta: {
  package: {

diff --git a/x-pack/test/api_integration/apis/fleet/index.js b/x-pack/test/api_integration/apis/fleet/index.js
@@ -5,9 +5,7 @@
  */
 
 export default function loadTests({ loadTestFile }) {
- // Temporarily skipped to promote snapshot
- // Re-enabled in https://github.com/elastic/kibana/pull/71727
- describe.skip('Fleet Endpoints', () => {
+ describe('Fleet Endpoints', () => {
  loadTestFile(require.resolve('./setup'));
  loadTestFile(require.resolve('./delete_agent'));
  loadTestFile(require.resolve('./list_agent'));

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
@@ -51,8 +51,7 @@ export default function ({ getService }: FtrProviderContext) {
  await deleteComposableIndexTemplate(name);
  };
 
- // Temporarily skipping tests until ES snapshot is updated
- describe.skip('Data streams', function () {
+ describe('Data streams', function () {
  describe('Get', () => {
  const testDataStreamName = 'test-data-stream';
 

diff --git a/x-pack/test/ingest_manager_api_integration/apis/epm/install.ts b/x-pack/test/ingest_manager_api_integration/apis/epm/install.ts
@@ -21,9 +21,7 @@ export default function ({ getService }: FtrProviderContext) {
  const mappingsPackage = 'overrides-0.1.0';
  const server = dockerServers.get('registry');
 
- // Temporarily skipped to promote snapshot
- // Re-enabled in https://github.com/elastic/kibana/pull/71727
- describe.skip('installs packages that include settings and mappings overrides', async () => {
+ describe('installs packages that include settings and mappings overrides', async () => {
  after(async () => {
  if (server.enabled) {
  // remove the package just in case it being installed will affect other tests

diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -19,9 +19,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
  const testSubjects = getService('testSubjects');
  const policyTestResources = getService('policyTestResources');
 
- // Temporarily skipped to promote snapshot
- // Re-enabled in https://github.com/elastic/kibana/pull/71727
- describe.skip('When on the Endpoint Policy Details Page', function () {
+ describe('When on the Endpoint Policy Details Page', function () {
  this.tags(['ciGroup7']);
 
  describe('with an invalid policy id', () => {

diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
@@ -19,9 +19,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
  const policyTestResources = getService('policyTestResources');
  const RELATIVE_DATE_FORMAT = /\d (?:seconds|minutes) ago/i;
 
- // Temporarily skipped to promote snapshot
- // Re-enabled in https://github.com/elastic/kibana/pull/71727
- describe.skip('When on the Endpoint Policy List', function () {
+ describe('When on the Endpoint Policy List', function () {
  this.tags(['ciGroup7']);
  before(async () => {
  await pageObjects.policy.navigateToPolicyList();