[Stack Monitoring] add back api integration tests and update esArchiver data (#126998)

* comment tests back in for es, kibana, cluster, logstash

* comment tests back in for APM and update data to ECS .monitoring-beats-8-mb

* add beats integration tests and update archive data

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

x-pack/test/api_integration/apis/monitoring/apm/index.js

@@ -8,10 +8,10 @@
 export default function ({ loadTestFile }) {
   describe('APM', () => {
     loadTestFile(require.resolve('./overview'));
-    // loadTestFile(require.resolve('./overview_mb'));
+    loadTestFile(require.resolve('./overview_mb'));
     loadTestFile(require.resolve('./instances'));
-    // loadTestFile(require.resolve('./instances_mb'));
+    loadTestFile(require.resolve('./instances_mb'));
     loadTestFile(require.resolve('./instance'));
-    // loadTestFile(require.resolve('./instance_mb'));
+    loadTestFile(require.resolve('./instance_mb'));
   });
 }

x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js

@@ -7,12 +7,13 @@
 
 import expect from '@kbn/expect';
 import apmInstanceFixture from './fixtures/instance';
+import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
 
   describe('instance detail mb', () => {
+    const { setup, tearDown } = getLifecycleMethods(getService);
     const archive = 'x-pack/test/functional/es_archives/monitoring/apm_mb';
     const timeRange = {
       min: '2018-08-31T12:59:49.104Z',
@@ -20,11 +21,11 @@ export default function ({ getService }) {
     };
 
     before('load archive', () => {
-      return esArchiver.load(archive);
+      return setup(archive);
     });
 
     after('unload archive', () => {
-      return esArchiver.unload(archive);
+      return tearDown();
     });
 
     it('should get apm instance data', async () => {

x-pack/test/api_integration/apis/monitoring/apm/instances_mb.js

@@ -6,24 +6,25 @@
  */
 
 import expect from '@kbn/expect';
+import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
 
   describe('list mb', () => {
+    const { setup, tearDown } = getLifecycleMethods(getService);
     const archive = 'x-pack/test/functional/es_archives/monitoring/apm_mb';
     const timeRange = {
       min: '2018-08-31T12:59:49.104Z',
       max: '2018-08-31T13:59:49.104Z',
     };
 
-    before('load clusters archive', () => {
-      return esArchiver.load(archive);
+    before('load archive', () => {
+      return setup(archive);
     });
 
-    after('unload clusters archive', () => {
-      return esArchiver.unload(archive);
+    after('unload archive', () => {
+      return tearDown();
     });
 
     it('should load multiple clusters', async () => {

x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js

@@ -7,14 +7,15 @@
 
 import expect from '@kbn/expect';
 import apmClusterFixture from './fixtures/cluster';
+import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
 
   describe('overview mb', function () {
     // Archive contains non-cgroup data which collides with the in-cgroup APM server present by default on cloud deployments
     this.tags(['skipCloud']);
+    const { setup, tearDown } = getLifecycleMethods(getService);
 
     const archive = 'x-pack/test/functional/es_archives/monitoring/apm_mb';
     const timeRange = {
@@ -23,11 +24,11 @@ export default function ({ getService }) {
     };
 
     before('load archive', () => {
-      return esArchiver.load(archive);
+      return setup(archive);
     });
 
     after('unload archive', () => {
-      return esArchiver.unload(archive);
+      return tearDown();
     });
 
     it('should summarize apm cluster with metrics', async () => {

x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js

@@ -7,12 +7,13 @@
 
 import expect from '@kbn/expect';
 import beatDetailFixture from './fixtures/detail';
+import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
 
   describe('instance detail mb', () => {
+    const { setup, tearDown } = getLifecycleMethods(getService);
     const archive =
       'x-pack/test/functional/es_archives/monitoring/beats_with_restarted_instance_mb';
     const timeRange = {
@@ -21,11 +22,11 @@ export default function ({ getService }) {
     };
 
     before('load archive', () => {
-      return esArchiver.load(archive);
+      return setup(archive);
     });
 
     after('unload archive', () => {
-      return esArchiver.unload(archive);
+      return tearDown();
     });
 
     it('should summarize beat with metrics', async () => {

x-pack/test/api_integration/apis/monitoring/beats/index.js

@@ -8,10 +8,10 @@
 export default function ({ loadTestFile }) {
   describe('Beats', () => {
     loadTestFile(require.resolve('./overview'));
-    // loadTestFile(require.resolve('./overview_mb'));
+    loadTestFile(require.resolve('./overview_mb'));
     loadTestFile(require.resolve('./list'));
-    // loadTestFile(require.resolve('./list_mb'));
+    loadTestFile(require.resolve('./list_mb'));
     loadTestFile(require.resolve('./detail'));
-    // loadTestFile(require.resolve('./detail_mb'));
+    loadTestFile(require.resolve('./detail_mb'));
   });
 }

x-pack/test/api_integration/apis/monitoring/beats/list_mb.js

@@ -6,12 +6,13 @@
  */
 
 import expect from '@kbn/expect';
+import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
 
   describe('list mb', () => {
+    const { setup, tearDown } = getLifecycleMethods(getService);
     describe('with restarted beat instance', () => {
       const archive =
         'x-pack/test/functional/es_archives/monitoring/beats_with_restarted_instance_mb';
@@ -20,12 +21,12 @@ export default function ({ getService }) {
         max: '2018-02-09T21:50:00Z',
       };
 
-      before('load clusters archive', () => {
-        return esArchiver.load(archive);
+      before('load archive', () => {
+        return setup(archive);
       });
 
-      after('unload clusters archive', () => {
-        return esArchiver.unload(archive);
+      after('unload archive', () => {
+        return tearDown();
       });
 
       it('should load multiple clusters', async () => {

x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js

@@ -7,12 +7,13 @@
 
 import expect from '@kbn/expect';
 import beatsClusterFixture from './fixtures/cluster';
+import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
 
   describe('overview mb', () => {
+    const { setup, tearDown } = getLifecycleMethods(getService);
     const archive = 'x-pack/test/functional/es_archives/monitoring/beats_mb';
     const timeRange = {
       min: '2017-12-19T18:11:32.000Z',
@@ -20,11 +21,11 @@ export default function ({ getService }) {
     };
 
     before('load archive', () => {
-      return esArchiver.load(archive);
+      return setup(archive);
     });
 
     after('unload archive', () => {
-      return esArchiver.unload(archive);
+      return tearDown();
     });
 
     it('should summarize beats cluster with metrics', async () => {

x-pack/test/api_integration/apis/monitoring/cluster/index.js

@@ -8,8 +8,8 @@
 export default function ({ loadTestFile }) {
   describe('cluster', () => {
     loadTestFile(require.resolve('./list'));
-    // loadTestFile(require.resolve('./list_mb'));
+    loadTestFile(require.resolve('./list_mb'));
     loadTestFile(require.resolve('./overview'));
-    // loadTestFile(require.resolve('./overview_mb'));
+    loadTestFile(require.resolve('./overview_mb'));
   });
 }

x-pack/test/api_integration/apis/monitoring/elasticsearch/index.js

@@ -8,20 +8,20 @@
 export default function ({ loadTestFile }) {
   describe('Elasticsearch', () => {
     loadTestFile(require.resolve('./overview'));
-    // loadTestFile(require.resolve('./overview_mb'));
+    loadTestFile(require.resolve('./overview_mb'));
     loadTestFile(require.resolve('./nodes'));
-    // loadTestFile(require.resolve('./nodes_mb'));
+    loadTestFile(require.resolve('./nodes_mb'));
     loadTestFile(require.resolve('./node_detail'));
-    // loadTestFile(require.resolve('./node_detail_mb'));
+    loadTestFile(require.resolve('./node_detail_mb'));
     loadTestFile(require.resolve('./node_detail_advanced'));
-    // loadTestFile(require.resolve('./node_detail_advanced_mb'));
+    loadTestFile(require.resolve('./node_detail_advanced_mb'));
     loadTestFile(require.resolve('./indices'));
-    // loadTestFile(require.resolve('./indices_mb'));
+    loadTestFile(require.resolve('./indices_mb'));
     loadTestFile(require.resolve('./index_detail'));
-    // loadTestFile(require.resolve('./index_detail_mb'));
+    loadTestFile(require.resolve('./index_detail_mb'));
     loadTestFile(require.resolve('./ccr'));
-    // loadTestFile(require.resolve('./ccr_mb'));
+    loadTestFile(require.resolve('./ccr_mb'));
     loadTestFile(require.resolve('./ccr_shard'));
-    // loadTestFile(require.resolve('./ccr_shard_mb'));
+    loadTestFile(require.resolve('./ccr_shard_mb'));
   });
 }

x-pack/test/api_integration/apis/monitoring/kibana/index.js

@@ -8,10 +8,10 @@
 export default function ({ loadTestFile }) {
   describe('Kibana', () => {
     loadTestFile(require.resolve('./overview'));
-    // loadTestFile(require.resolve('./overview_mb'));
+    loadTestFile(require.resolve('./overview_mb'));
     loadTestFile(require.resolve('./listing'));
-    // loadTestFile(require.resolve('./listing_mb'));
+    loadTestFile(require.resolve('./listing_mb'));
     loadTestFile(require.resolve('./instance'));
-    // loadTestFile(require.resolve('./instance_mb'));
+    loadTestFile(require.resolve('./instance_mb'));
   });
 }

x-pack/test/api_integration/apis/monitoring/logstash/index.js

@@ -8,14 +8,14 @@
 export default function ({ loadTestFile }) {
   describe('Logstash', () => {
     loadTestFile(require.resolve('./overview'));
-    // loadTestFile(require.resolve('./overview_mb'));
+    loadTestFile(require.resolve('./overview_mb'));
     loadTestFile(require.resolve('./nodes'));
-    // loadTestFile(require.resolve('./nodes_mb'));
+    loadTestFile(require.resolve('./nodes_mb'));
     loadTestFile(require.resolve('./node_detail'));
-    // loadTestFile(require.resolve('./node_detail_mb'));
+    loadTestFile(require.resolve('./node_detail_mb'));
     loadTestFile(require.resolve('./multicluster_pipelines'));
-    // loadTestFile(require.resolve('./multicluster_pipelines_mb'));
+    loadTestFile(require.resolve('./multicluster_pipelines_mb'));
     loadTestFile(require.resolve('./pipelines'));
-    // loadTestFile(require.resolve('./pipelines_mb'));
+    loadTestFile(require.resolve('./pipelines_mb'));
   });
 }