Migrate /diagnostics and /service_nodes to be deployment agnostic

oas_docs/output/kibana.serverless.yaml

@@ -16693,14 +16693,10 @@ paths:
                       type: object
                       properties:
                         active:
-                          description: >-
-                            When false, the enrollment API key is revoked and
-                            cannot be used for enrolling Elastic Agents.
+                          description: When false, the enrollment API key is revoked and cannot be used for enrolling Elastic Agents.
                           type: boolean
                         api_key:
-                          description: >-
-                            The enrollment API key (token) used for enrolling
-                            Elastic Agents.
+                          description: The enrollment API key (token) used for enrolling Elastic Agents.
                           type: string
                         api_key_id:
                           description: The ID of the API key in the Security API.
@@ -16713,9 +16709,7 @@ paths:
                           description: The name of the enrollment API key.
                           type: string
                         policy_id:
-                          description: >-
-                            The ID of the agent policy the Elastic Agent will be
-                            enrolled in.
+                          description: The ID of the agent policy the Elastic Agent will be enrolled in.
                           type: string
                       required:
                         - id

oas_docs/output/kibana.yaml

@@ -19477,14 +19477,10 @@ paths:
                       type: object
                       properties:
                         active:
-                          description: >-
-                            When false, the enrollment API key is revoked and
-                            cannot be used for enrolling Elastic Agents.
+                          description: When false, the enrollment API key is revoked and cannot be used for enrolling Elastic Agents.
                           type: boolean
                         api_key:
-                          description: >-
-                            The enrollment API key (token) used for enrolling
-                            Elastic Agents.
+                          description: The enrollment API key (token) used for enrolling Elastic Agents.
                           type: string
                         api_key_id:
                           description: The ID of the API key in the Security API.
@@ -19497,9 +19493,7 @@ paths:
                           description: The name of the enrollment API key.
                           type: string
                         policy_id:
-                          description: >-
-                            The ID of the agent policy the Elastic Agent will be
-                            enrolled in.
+                          description: The ID of the agent policy the Elastic Agent will be enrolled in.
                           type: string
                       required:
                         - id

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/agent_explorer/index.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
   describe('agent_explorer', () => {

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/alerts/error_count_threshold.spec.ts

@@ -10,7 +10,7 @@ import { errorCountActionVariables } from '@kbn/apm-plugin/server/routes/alerts/
 import { apm, timerange } from '@kbn/apm-synthtrace-client';
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
-import { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
+import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
 import type { RoleCredentials } from '../../../../services';
 import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 import {

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/alerts/index.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
   describe('alerts', () => {

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/alerts/preview_chart_error_count.spec.ts

@@ -7,7 +7,7 @@
 
 import type { PreviewChartResponseItem } from '@kbn/apm-plugin/server/routes/alerts/route';
 import expect from '@kbn/expect';
-import { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
+import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
 import {
   ERROR_GROUP_ID,
   SERVICE_ENVIRONMENT,

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/alerts/preview_chart_error_rate.spec.ts

@@ -13,7 +13,7 @@ import {
 } from '@kbn/observability-shared-plugin/common';
 import type { PreviewChartResponseItem } from '@kbn/apm-plugin/server/routes/alerts/route';
 import expect from '@kbn/expect';
-import { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
+import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
 import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 import { generateErrorData } from './generate_data';
 

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/cold_start/index.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
   describe('cold_start', () => {

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/correlations/index.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
   describe('correlations', () => {

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/custom_dashboards/index.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
   describe('custom_dashboards', () => {

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/data_view/index.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
   describe('data_view', () => {

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/dependencies/index.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
   describe('custom_dashboards', () => {

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/dependencies/top_dependencies.spec.ts

@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { NodeType, DependencyNode } from '@kbn/apm-plugin/common/connections';
-import { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
+import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
 import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 import { dataConfig, generateData } from './generate_data';
 import { roundNumber } from '../utils/common';

x-pack/test/apm_api_integration/tests/diagnostics/apm_events.spec.ts → x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/diagnostics/apm_events.spec.ts

@@ -9,19 +9,18 @@ import expect from '@kbn/expect';
 import { apm, timerange } from '@kbn/apm-synthtrace-client';
 import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { sumBy } from 'lodash';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
+import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 
-export default function ApiTest({ getService }: FtrProviderContext) {
-  const registry = getService('registry');
-  const apmApiClient = getService('apmApiClient');
+export default function ApiTest({ getService }: DeploymentAgnosticFtrProviderContext) {
+  const apmApiClient = getService('apmApi');
   const es = getService('es');
-  const apmSynthtraceEsClient = getService('apmSynthtraceEsClient');
+  const synthtrace = getService('synthtrace');
 
   const start = new Date('2021-01-01T00:00:00.000Z').getTime();
   const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
 
-  // FLAKY: https://github.com/elastic/kibana/issues/177144
-  registry.when('Diagnostics: APM Events', { config: 'basic', archives: [] }, () => {
+  describe('Diagnostics: APM Events', () => {
     describe('When there is no data', () => {
       before(async () => {
         // delete APM data streams
@@ -38,10 +37,13 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     });
 
     describe('When data is ingested', () => {
+      let apmSynthtraceEsClient: ApmSynthtraceEsClient;
+
       before(async () => {
         const instance = apm
           .service({ name: 'synth-go', environment: 'production', agentName: 'go' })
           .instance('instance-a');
+        apmSynthtraceEsClient = await synthtrace.createApmSynthtraceEsClient();
 
         await apmSynthtraceEsClient.index(
           timerange(start, end)

x-pack/test/apm_api_integration/tests/diagnostics/data_streams.spec.ts → x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/diagnostics/data_streams.spec.ts

@@ -7,20 +7,18 @@
 
 import expect from '@kbn/expect';
 import { apm, timerange } from '@kbn/apm-synthtrace-client';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
+import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 
-export default function ApiTest({ getService }: FtrProviderContext) {
-  const registry = getService('registry');
-  const apmApiClient = getService('apmApiClient');
+export default function ApiTest({ getService }: DeploymentAgnosticFtrProviderContext) {
+  const apmApiClient = getService('apmApi');
   const es = getService('es');
-  const apmSynthtraceEsClient = getService('apmSynthtraceEsClient');
-  const synthtraceKibanaClient = getService('synthtraceKibanaClient');
+  const synthtrace = getService('synthtrace');
 
   const start = new Date('2021-01-01T00:00:00.000Z').getTime();
   const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
 
-  // FLAKY: https://github.com/elastic/kibana/issues/177245
-  registry.when('Diagnostics: Data streams', { config: 'basic', archives: [] }, () => {
+  describe('Diagnostics: Data streams', () => {
     describe('When there is no data', () => {
       before(async () => {
         // delete APM data streams
@@ -45,9 +43,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     });
 
     describe('When data is ingested', () => {
+      let apmSynthtraceEsClient: ApmSynthtraceEsClient;
+
       before(async () => {
-        const latestVersion = await synthtraceKibanaClient.fetchLatestApmPackageVersion();
-        await synthtraceKibanaClient.installApmPackage(latestVersion);
+        apmSynthtraceEsClient = await synthtrace.createApmSynthtraceEsClient();
 
         const instance = apm
           .service({ name: 'synth-go', environment: 'production', agentName: 'go' })

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/diagnostics/index.ts

@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
+  describe('diagnostics', () => {
+    loadTestFile(require.resolve('./apm_events.spec.ts'));
+    loadTestFile(require.resolve('./data_streams.spec.ts'));
+    loadTestFile(require.resolve('./index_pattern_settings.spec.ts'));
+    loadTestFile(require.resolve('./index_templates.spec.ts'));
+    loadTestFile(require.resolve('./indices.spec.ts'));
+    loadTestFile(require.resolve('./privileges.spec.ts'));
+  });
+}

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/diagnostics/index_pattern_settings.spec.ts

@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { apm, timerange } from '@kbn/apm-synthtrace-client';
+import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
+import { uniq } from 'lodash';
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ApiTest({ getService }: DeploymentAgnosticFtrProviderContext) {
+  const apmApiClient = getService('apmApi');
+  const synthtrace = getService('synthtrace');
+
+  const start = new Date('2021-01-01T00:00:00.000Z').getTime();
+  const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
+
+  describe('Diagnostics: Index pattern settings', () => {
+    describe('When data is ingested', () => {
+      let apmSynthtraceEsClient: ApmSynthtraceEsClient;
+
+      before(async () => {
+        apmSynthtraceEsClient = await synthtrace.createApmSynthtraceEsClient();
+
+        const instance = apm
+          .service({ name: 'synth-go', environment: 'production', agentName: 'go' })
+          .instance('instance-a');
+        await apmSynthtraceEsClient.index(
+          timerange(start, end)
+            .interval('1m')
+            .rate(30)
+            .generator((timestamp) =>
+              instance
+                .transaction({ transactionName: 'GET /users' })
+                .timestamp(timestamp)
+                .duration(100)
+                .success()
+            )
+        );
+      });
+
+      after(() => apmSynthtraceEsClient.clean());
+
+      it('returns APM index templates', async () => {
+        const apmIndexTemplatesPatterns = ['apm', 'otel'];
+
+        const { status, body } = await apmApiClient.adminUser({
+          endpoint: 'GET /internal/apm/diagnostics',
+        });
+        expect(status).to.be(200);
+
+        // filtering the array for unique index templates because they get duplicated across different index patterns
+        const uniqueTemplateNames = uniq(
+          body.indexTemplatesByIndexPattern.flatMap(({ indexTemplates }) => {
+            return indexTemplates?.map(({ templateName }) => templateName);
+          })
+        );
+
+        // filter only APM releated indices
+        const apmTemplateNames = uniqueTemplateNames.filter(
+          (templateName) =>
+            templateName.endsWith('@template') &&
+            apmIndexTemplatesPatterns.some((pattern) => templateName.includes(pattern))
+        );
+
+        // sort alphabeticaly before comparing because an order is different between testing environments
+        const sortedApmTemplates = apmTemplateNames.sort();
+
+        expect(sortedApmTemplates).to.eql([
+          'logs-apm.app@template',
+          'logs-apm.error@template',
+          'logs-otel@template',
+          'metrics-apm.app@template',
+          'metrics-apm.internal@template',
+          'metrics-apm.service_destination.10m@template',
+          'metrics-apm.service_destination.1m@template',
+          'metrics-apm.service_destination.60m@template',
+          'metrics-apm.service_summary.10m@template',
+          'metrics-apm.service_summary.1m@template',
+          'metrics-apm.service_summary.60m@template',
+          'metrics-apm.service_transaction.10m@template',
+          'metrics-apm.service_transaction.1m@template',
+          'metrics-apm.service_transaction.60m@template',
+          'metrics-apm.transaction.10m@template',
+          'metrics-apm.transaction.1m@template',
+          'metrics-apm.transaction.60m@template',
+          'metrics-otel@template',
+          'metrics-service_summary.10m.otel@template',
+          'metrics-service_summary.1m.otel@template',
+          'metrics-service_summary.60m.otel@template',
+          'metrics-service_transaction.10m.otel@template',
+          'metrics-service_transaction.1m.otel@template',
+          'metrics-service_transaction.60m.otel@template',
+          'metrics-transaction.10m.otel@template',
+          'metrics-transaction.1m.otel@template',
+          'metrics-transaction.60m.otel@template',
+          'traces-apm.rum@template',
+          'traces-apm.sampled@template',
+          'traces-apm@template',
+          'traces-otel@template',
+        ]);
+      });
+    });
+  });
+}