Migrate /diagnostics and /service_nodes to be deployment agnostic by miloszmarcinkowski · Pull Request #199645 · elastic/kibana

miloszmarcinkowski · 2024-11-11T13:14:11Z

closes #198967
closes #198985
part of #193245

How to test

Serverless

node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
node scripts/functional_test_runner --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep="APM"

Stateful

node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
node scripts/functional_test_runner --config x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts --grep="APM"

MKI

Checklist

(OPTIONAL, only if a test has been unskipped) Run flaky test suite
serverless
stateful
MKI

…agnostic API tests

…testapm_api_integrationtestsdiagnostics-to-be-deployment-agnostic-api-tests

kibanamachine · 2024-11-13T11:55:17Z

Flaky Test Runner Stats

🎉 All tests passed! - kibana-flaky-test-suite-runner#7390

[✅] x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts: 25/25 tests passed.
[✅] x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts: 25/25 tests passed.

see run history

…t-agnostic API tests

…nodes-to-be-deployment-agnostic-api-tests' into 198967-apm-migrate-testapm_api_integrationtestsdiagnostics-to-be-deployment-agnostic-api-tests

miloszmarcinkowski · 2024-11-13T13:14:58Z

...ration/deployment_agnostic/apis/observability/apm/diagnostics/index_pattern_settings.spec.ts

+          })
+        );
+
+        const apmTemplateNames = uniqueTemplateNames.filter((templateName) =>


We filter out only apm and otel index templates for the test, otherwise they differ on serverless and test fails

elasticmachine · 2024-11-13T13:15:03Z

Pinging @elastic/obs-ux-infra_services-team (Team:obs-ux-infra_services)

github-actions · 2024-11-13T13:15:13Z

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

/oblt-deploy : Deploy a Kibana instance using the Observability test environments.
run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

miloszmarcinkowski · 2024-11-13T13:19:38Z

...ration/deployment_agnostic/apis/observability/apm/diagnostics/index_pattern_settings.spec.ts

  const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;

-  describe.skip('Diagnostics: Index pattern settings', () => {
-    describe('When there is no data', () => {


When default index templates are deleted, they get recreated automatically. It was introduced here: elastic/elasticsearch#97546

This means we can't perform check against empty response anymore.

miloszmarcinkowski · 2024-11-13T13:19:43Z

...i_integration/deployment_agnostic/apis/observability/apm/diagnostics/index_templates.spec.ts

  const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;

-  describe.skip('Diagnostics: Index Templates', () => {
-    describe('When there is no data', () => {


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.

rmyz

LGTM, small change requested

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

Co-authored-by: Sergi Romeu <sergi.romeu@elastic.co>

…stsdiagnostics-to-be-deployment-agnostic-api-tests

crespocarlos · 2024-11-14T10:22:37Z

...st/api_integration/deployment_agnostic/apis/observability/apm/diagnostics/apm_events.spec.ts

 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 { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';


nit.

Suggested change

import { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';

import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';

I updated all /apm/* tests by adding type-only imports.

crespocarlos · 2024-11-14T10:25:05Z

.../api_integration/deployment_agnostic/apis/observability/apm/diagnostics/data_streams.spec.ts

+        const apmSynthtraceKibanaClient = synthtrace.apmSynthtraceKibanaClient;
+        const latestVersion = await apmSynthtraceKibanaClient.fetchLatestApmPackageVersion();
+        await apmSynthtraceKibanaClient.installApmPackage(latestVersion);


createApmSynthtraceEsClient already installs the latest apm package version. Why is this needed?

Thanks for review. Those were remainings from the old test and I didn't notice that apm packge is installed in createApmSynthtraceEsClient. Updated!

crespocarlos · 2024-11-14T10:25:18Z

...ration/deployment_agnostic/apis/observability/apm/diagnostics/index_pattern_settings.spec.ts

+        const apmSynthtraceKibanaClient = synthtrace.apmSynthtraceKibanaClient;
+        const latestVersion = await apmSynthtraceKibanaClient.fetchLatestApmPackageVersion();
+        await apmSynthtraceKibanaClient.installApmPackage(latestVersion);


…ents

crespocarlos

LGTM! Thanks for the changes.

…testapm_api_integrationtestsdiagnostics-to-be-deployment-agnostic-api-tests

elasticmachine · 2024-11-14T14:28:37Z

💔 Build Failed

Buildkite Build
Commit: 2e2d110
Kibana Serverless Image: docker.elastic.co/kibana-ci/kibana-serverless:pr-199645-2e2d1106ad0c

Failed CI Steps

Post-Build

Metrics [docs]

‼️ ERROR: no builds found for mergeBase sha [75679b2]

History

💚 Build #251135 succeeded b9a4a03
💚 Build #250849 succeeded ec4c5cc
💚 Build #250695 succeeded 9e7b6fe
💔 Build #250541 failed dd0a870
💔 Build #250468 failed b2d307a

kibanamachine · 2024-11-14T15:39:31Z

Starting backport for target branches: 8.x

https://github.com/elastic/kibana/actions/runs/11840525161

kibanamachine · 2024-11-14T15:45:09Z

💔 All backports failed

Status	Branch	Result
❌	8.x	Backport failed because of merge conflicts You might need to backport the following PRs to 8.x: - [APM] Migrate service tests to deployment agnostic (#199812)

Manual backport

To create the backport manually run:

node scripts/backport --pr 199645

Questions ?

Please refer to the Backport tool documentation

kibanamachine · 2024-11-15T15:48:49Z

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 199645 locally

…astic#199645) closes elastic#198967 closes elastic#198985 part of elastic#193245 ### How to test - Serverless ``` node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts node scripts/functional_test_runner --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep="APM" ``` - Stateful ``` node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts node scripts/functional_test_runner --config x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts --grep="APM" ``` - [MKI](https://github.com/crespocarlos/kibana/blob/main/x-pack/test_serverless/README.md#run-tests-on-mki) ### Checklist - [x] (OPTIONAL, only if a test has been unskipped) Run flaky test suite - [x] serverless - [x] stateful - [x] MKI --------- Co-authored-by: Sergi Romeu <sergi.romeu@elastic.co>

miloszmarcinkowski · 2024-11-18T13:19:05Z

💚 All backports created successfully

Status	Branch	Result
✅	8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

…astic#199645) closes elastic#198967 closes elastic#198985 part of elastic#193245 ### How to test - Serverless ``` node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts node scripts/functional_test_runner --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep="APM" ``` - Stateful ``` node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts node scripts/functional_test_runner --config x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts --grep="APM" ``` - [MKI](https://github.com/crespocarlos/kibana/blob/main/x-pack/test_serverless/README.md#run-tests-on-mki) ### Checklist - [x] (OPTIONAL, only if a test has been unskipped) Run flaky test suite - [x] serverless - [x] stateful - [x] MKI --------- Co-authored-by: Sergi Romeu <sergi.romeu@elastic.co> (cherry picked from commit 04b2d62)

…ic (#199645) (#200563) # Backport This will backport the following commits from `main` to `8.x`: - [Migrate /diagnostics and /service_nodes to be deployment agnostic (#199645)](#199645)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)

…astic#199645) closes elastic#198967 closes elastic#198985 part of elastic#193245 - Serverless ``` node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts node scripts/functional_test_runner --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep="APM" ``` - Stateful ``` node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts node scripts/functional_test_runner --config x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts --grep="APM" ``` - [MKI](https://github.com/crespocarlos/kibana/blob/main/x-pack/test_serverless/README.md#run-tests-on-mki) - [x] (OPTIONAL, only if a test has been unskipped) Run flaky test suite - [x] serverless - [x] stateful - [x] MKI --------- Co-authored-by: Sergi Romeu <sergi.romeu@elastic.co> (cherry picked from commit 04b2d62)

Migrate /test/apm_api_integration/tests/diagnostics to be deployment-…

30d377a

…agnostic API tests

miloszmarcinkowski added backport:prev-minor release_note:skip Skip the PR/issue when compiling release notes labels Nov 11, 2024

miloszmarcinkowski added 6 commits November 11, 2024 15:37

Merge remote-tracking branch 'upstream/main' into 198967-apm-migrate-…

11c847e

…testapm_api_integrationtestsdiagnostics-to-be-deployment-agnostic-api-tests

Merge remote-tracking branch 'upstream/main' into 198967-apm-migrate-…

fefc157

…testapm_api_integrationtestsdiagnostics-to-be-deployment-agnostic-api-tests

unskip tests

3f29f99

filter out apm index templates

b2d307a

type check fix

dd0a870

Merge remote-tracking branch 'upstream/main' into 198967-apm-migrate-…

9e7b6fe

…testapm_api_integrationtestsdiagnostics-to-be-deployment-agnostic-api-tests

miloszmarcinkowski added 2 commits November 13, 2024 13:05

Migrate /test/apm_api_integration/tests/service_nodes to be deploymen…

11ce02a

…t-agnostic API tests

Merge branch '198985-apm-migrate-testapm_api_integrationtestsservice_…

8f8ef6c

…nodes-to-be-deployment-agnostic-api-tests' into 198967-apm-migrate-testapm_api_integrationtestsdiagnostics-to-be-deployment-agnostic-api-tests

miloszmarcinkowski marked this pull request as ready for review November 13, 2024 13:11

miloszmarcinkowski requested a review from a team as a code owner November 13, 2024 13:11

miloszmarcinkowski requested a review from a team November 13, 2024 13:11

miloszmarcinkowski commented Nov 13, 2024

View reviewed changes

botelastic bot added ci:project-deploy-observability Create an Observability project Team:obs-ux-infra_services - DEPRECATED DEPRECATED - Use Team:obs-presentation. labels Nov 13, 2024

miloszmarcinkowski commented Nov 13, 2024

View reviewed changes

miloszmarcinkowski changed the title ~~Migrate /test/apm_api_integration/tests/diagnostics to be deployment agnostic~~ Migrate /diagnostics and /service_nodes to be deployment agnostic Nov 13, 2024

rmyz approved these changes Nov 13, 2024

View reviewed changes

x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/service_nodes/index.ts Outdated Show resolved Hide resolved

Correct describe block title

ec4c5cc

Co-authored-by: Sergi Romeu <sergi.romeu@elastic.co>

wayneseymour approved these changes Nov 14, 2024

View reviewed changes

Merge branch 'main' into 198967-apm-migrate-testapm_api_integrationte…

b9a4a03

…stsdiagnostics-to-be-deployment-agnostic-api-tests

miloszmarcinkowski enabled auto-merge (squash) November 14, 2024 09:34

crespocarlos reviewed Nov 14, 2024

View reviewed changes

miloszmarcinkowski disabled auto-merge November 14, 2024 10:26

remove duplicated apm package instalation

2bd7dae

miloszmarcinkowski added 2 commits November 14, 2024 12:09

convert to Type-Only imports in apm/* tests

28c1ba6

adjust index_pattern_settings.spec.ts to work in all testing environm…

7a56f8c

…ents

crespocarlos approved these changes Nov 14, 2024

View reviewed changes

Merge remote-tracking branch 'upstream/main' into 198967-apm-migrate-…

50d8fba

…testapm_api_integrationtestsdiagnostics-to-be-deployment-agnostic-api-tests

miloszmarcinkowski enabled auto-merge (squash) November 14, 2024 13:08

[CI] Auto-commit changed files from 'make api-docs'

2e2d110

miloszmarcinkowski merged commit 04b2d62 into elastic:main Nov 14, 2024

kibanamachine added the v9.0.0 label Nov 14, 2024

miloszmarcinkowski mentioned this pull request Nov 14, 2024

[8.x] [APM] Migrate /mobile API tests to deployment agnostic folder (#199021) #199689

Merged

kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Nov 15, 2024

miloszmarcinkowski mentioned this pull request Nov 18, 2024

[8.x] Migrate /diagnostics and /service_nodes to be deployment agnostic (#199645) #200563

Merged

kibanamachine added v8.17.0 and removed backport missing Added to PRs automatically when the are determined to be missing a backport. labels Nov 18, 2024

	import { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
	import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';

Conversation

miloszmarcinkowski commented Nov 11, 2024 • edited by kibanamachine Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How to test

Checklist

Uh oh!

kibanamachine commented Nov 13, 2024

Flaky Test Runner Stats

🎉 All tests passed! - kibana-flaky-test-suite-runner#7390

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elasticmachine commented Nov 13, 2024

Uh oh!

github-actions bot commented Nov 13, 2024

🤖 GitHub comments

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rmyz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

crespocarlos left a comment

Choose a reason for hiding this comment

Uh oh!

elasticmachine commented Nov 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💔 Build Failed

Failed CI Steps

Metrics [docs]

History

Uh oh!

kibanamachine commented Nov 14, 2024

Uh oh!

kibanamachine commented Nov 14, 2024

💔 All backports failed

Manual backport

Questions ?

Uh oh!

kibanamachine commented Nov 15, 2024

Uh oh!

miloszmarcinkowski commented Nov 18, 2024

💚 All backports created successfully

Questions ?

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

miloszmarcinkowski commented Nov 11, 2024 •

edited by kibanamachine

Loading

elasticmachine commented Nov 14, 2024 •

edited

Loading