comment tests back in for APM and update data to ECS .monitoring-beat…

…s-8-mb
elastic · Mar 7, 2022 · 8760614 · 8760614
1 parent fc8826b
commit 8760614
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 22,935 deletions.
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/index.js b/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'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js b/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js
@@ -7,24 +7,25 @@
 
 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',
       max: '2018-08-31T13:59:49.104Z',
     };
 
     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 () => {

diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instances_mb.js b/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 () => {

diff --git a/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js b/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 () => {

diff --git a/x-pack/test/functional/es_archives/monitoring/apm_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/apm_mb/data.json.gz