Migrate /diagnostics and /service_nodes to be deployment agnostic #199645
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 { 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')); | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /* | ||
| * 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 apmSynthtraceKibanaClient = synthtrace.apmSynthtraceKibanaClient; | ||
| const latestVersion = await apmSynthtraceKibanaClient.fetchLatestApmPackageVersion(); | ||
| await apmSynthtraceKibanaClient.installApmPackage(latestVersion); | ||
|
|
||
|
|
||
| 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); | ||
|
|
||
| const uniqueTemplateNames = uniq( | ||
| body.indexTemplatesByIndexPattern.flatMap(({ indexTemplates }) => { | ||
| return indexTemplates?.map(({ templateName }) => templateName); | ||
| }) | ||
| ); | ||
|
|
||
| const apmTemplateNames = uniqueTemplateNames.filter((templateName) => | ||
|
There was a problem hiding this comment. We filter out only |
||
| apmIndexTemplatesPatterns.some((pattern) => templateName.includes(pattern)) | ||
| ); | ||
|
|
||
| expect(apmTemplateNames).to.eql([ | ||
| 'logs-apm.error@template', | ||
| 'logs-apm.app@template', | ||
| 'logs-otel@template', | ||
| 'metrics-apm.service_transaction.1m@template', | ||
| 'metrics-apm.transaction.10m@template', | ||
| 'metrics-apm.service_summary.10m@template', | ||
| 'metrics-apm.internal@template', | ||
| 'metrics-apm.service_destination.1m@template', | ||
| 'metrics-apm.service_summary.60m@template', | ||
| 'metrics-apm.service_summary.1m@template', | ||
| 'metrics-apm.transaction.1m@template', | ||
| 'metrics-apm.service_destination.60m@template', | ||
| 'metrics-apm.service_transaction.60m@template', | ||
| 'metrics-apm.service_destination.10m@template', | ||
| 'metrics-apm.service_transaction.10m@template', | ||
| 'metrics-apm.transaction.60m@template', | ||
| 'metrics-apm.app@template', | ||
| 'metrics-otel@template', | ||
| 'metrics-service_transaction.10m.otel@template', | ||
| 'metrics-transaction.10m.otel@template', | ||
| 'metrics-service_summary.1m.otel@template', | ||
| 'metrics-service_transaction.60m.otel@template', | ||
| 'metrics-service_summary.60m.otel@template', | ||
| 'metrics-service_summary.10m.otel@template', | ||
| 'metrics-transaction.1m.otel@template', | ||
| 'metrics-transaction.60m.otel@template', | ||
| 'metrics-service_transaction.1m.otel@template', | ||
| 'traces-apm.rum@template', | ||
| 'traces-apm@template', | ||
| 'traces-apm.sampled@template', | ||
| 'traces-otel@template', | ||
| ]); | ||
| }); | ||
| }); | ||
| }); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,44 +7,25 @@ | |
|
|
||
| import expect from '@kbn/expect'; | ||
| import { apm, timerange } from '@kbn/apm-synthtrace-client'; | ||
| import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace'; | ||
| 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; | ||
|
|
||
|
There was a problem hiding this comment. When default index templates are deleted, they get recreated automatically. Introduced here: elastic/elasticsearch#97546 This means we can't perform check against empty response anymore. |
||
| describe('Diagnostics: Index Templates', () => { | ||
| describe('When data is ingested', () => { | ||
| let apmSynthtraceEsClient: ApmSynthtraceEsClient; | ||
|
|
||
| before(async () => { | ||
| apmSynthtraceEsClient = await synthtrace.createApmSynthtraceEsClient(); | ||
| const apmSynthtraceKibanaClient = synthtrace.apmSynthtraceKibanaClient; | ||
| const latestVersion = await apmSynthtraceKibanaClient.fetchLatestApmPackageVersion(); | ||
| await apmSynthtraceKibanaClient.installApmPackage(latestVersion); | ||
|
|
||
| const instance = apm | ||
| .service({ name: 'synth-go', environment: 'production', agentName: 'go' }) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I updated all
/apm/*tests by adding type-only imports.