From 4092b3b8f4f2f8b64d990f67e075ceacc3b8d027 Mon Sep 17 00:00:00 2001 From: Drew Tate Date: Wed, 4 Feb 2026 09:35:20 -0700 Subject: [PATCH 1/2] fix journey names --- .../journeys_e2e/data_stress_test_lens.ts | 12 ++++++++---- .../journeys_e2e/ecommerce_dashboard_map_only.ts | 12 ++++++++---- .../ecommerce_dashboard_saved_search_only.ts | 12 ++++++++---- .../ecommerce_dashboard_tsvb_gauge_only.ts | 12 ++++++++---- .../performance/journeys_e2e/flight_dashboard.ts | 12 ++++++++---- .../journeys_e2e/utils/dashboard_journey.ts | 16 +++++----------- .../journeys_e2e/web_logs_dashboard.ts | 12 ++++++++---- .../journeys_e2e/web_logs_dashboard_esql.ts | 12 ++++++++---- .../web_logs_dashboard_esql_long_running.ts | 12 ++++++++---- .../web_logs_dashboard_long_running.ts | 12 ++++++++---- 10 files changed, 77 insertions(+), 47 deletions(-) diff --git a/x-pack/performance/journeys_e2e/data_stress_test_lens.ts b/x-pack/performance/journeys_e2e/data_stress_test_lens.ts index ee926b7f2cc91..016c007220635 100644 --- a/x-pack/performance/journeys_e2e/data_stress_test_lens.ts +++ b/x-pack/performance/journeys_e2e/data_stress_test_lens.ts @@ -5,11 +5,15 @@ * 2.0. */ -import { createDashboardJourney } from './utils/dashboard_journey'; +import { Journey } from '@kbn/journeys'; +import { setupDashboardJourney } from './utils/dashboard_journey'; -export const journey = createDashboardJourney({ - esArchives: ['src/platform/test/functional/fixtures/es_archiver/stress_test'], - kbnArchives: ['src/platform/test/functional/fixtures/kbn_archiver/stress_test'], +export const journey = setupDashboardJourney({ + // call the journey constructor in this file so the name is set correctly + journey: new Journey({ + esArchives: ['src/platform/test/functional/fixtures/es_archiver/stress_test'], + kbnArchives: ['src/platform/test/functional/fixtures/kbn_archiver/stress_test'], + }), dashboardName: 'Stress Test Dashboard', dashboardLinkSubj: 'dashboardListingTitleLink-Stresstest', visualizationCount: 1, diff --git a/x-pack/performance/journeys_e2e/ecommerce_dashboard_map_only.ts b/x-pack/performance/journeys_e2e/ecommerce_dashboard_map_only.ts index b104a490b2b6c..640583531c500 100644 --- a/x-pack/performance/journeys_e2e/ecommerce_dashboard_map_only.ts +++ b/x-pack/performance/journeys_e2e/ecommerce_dashboard_map_only.ts @@ -5,11 +5,15 @@ * 2.0. */ -import { createDashboardJourney } from './utils/dashboard_journey'; +import { Journey } from '@kbn/journeys'; +import { setupDashboardJourney } from './utils/dashboard_journey'; -export const journey = createDashboardJourney({ - esArchives: ['x-pack/performance/es_archives/sample_data_ecommerce_many_fields'], - kbnArchives: ['x-pack/performance/kbn_archives/ecommerce_map_only_dashboard'], +export const journey = setupDashboardJourney({ + // call the journey constructor in this file so the name is set correctly + journey: new Journey({ + esArchives: ['x-pack/performance/es_archives/sample_data_ecommerce_many_fields'], + kbnArchives: ['x-pack/performance/kbn_archives/ecommerce_map_only_dashboard'], + }), dashboardName: 'Ecommerce Dashboard with Map only', dashboardLinkSubj: 'dashboardListingTitleLink-[eCommerce]-Map-Only', loadCompleteAwaiter: async (page, kibanaPage) => { diff --git a/x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts b/x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts index b72d32db28472..0c8a903a7a6aa 100644 --- a/x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts +++ b/x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts @@ -5,11 +5,15 @@ * 2.0. */ -import { createDashboardJourney } from './utils/dashboard_journey'; +import { Journey } from '@kbn/journeys'; +import { setupDashboardJourney } from './utils/dashboard_journey'; -export const journey = createDashboardJourney({ - esArchives: ['x-pack/performance/es_archives/sample_data_ecommerce_many_fields'], - kbnArchives: ['x-pack/performance/kbn_archives/ecommerce_saved_search_only_dashboard'], +export const journey = setupDashboardJourney({ + // call the journey constructor in this file so the name is set correctly + journey: new Journey({ + esArchives: ['x-pack/performance/es_archives/sample_data_ecommerce_many_fields'], + kbnArchives: ['x-pack/performance/kbn_archives/ecommerce_saved_search_only_dashboard'], + }), dashboardName: 'Ecommerce Dashboard with Saved Search only', dashboardLinkSubj: 'dashboardListingTitleLink-[eCommerce]-Saved-Search-Dashboard', visualizationCount: 1, diff --git a/x-pack/performance/journeys_e2e/ecommerce_dashboard_tsvb_gauge_only.ts b/x-pack/performance/journeys_e2e/ecommerce_dashboard_tsvb_gauge_only.ts index 74893fd3517c3..6011bcda13f69 100644 --- a/x-pack/performance/journeys_e2e/ecommerce_dashboard_tsvb_gauge_only.ts +++ b/x-pack/performance/journeys_e2e/ecommerce_dashboard_tsvb_gauge_only.ts @@ -5,11 +5,15 @@ * 2.0. */ -import { createDashboardJourney } from './utils/dashboard_journey'; +import { Journey } from '@kbn/journeys'; +import { setupDashboardJourney } from './utils/dashboard_journey'; -export const journey = createDashboardJourney({ - esArchives: ['x-pack/performance/es_archives/sample_data_ecommerce_many_fields'], - kbnArchives: ['x-pack/performance/kbn_archives/ecommerce_tsvb_gauge_only_dashboard'], +export const journey = setupDashboardJourney({ + // call the journey constructor in this file so the name is set correctly + journey: new Journey({ + esArchives: ['x-pack/performance/es_archives/sample_data_ecommerce_many_fields'], + kbnArchives: ['x-pack/performance/kbn_archives/ecommerce_tsvb_gauge_only_dashboard'], + }), dashboardName: 'Ecommerce Dashboard with TSVB Gauge only', dashboardLinkSubj: 'dashboardListingTitleLink-[eCommerce]-TSVB-Gauge-Only-Dashboard', visualizationCount: 1, diff --git a/x-pack/performance/journeys_e2e/flight_dashboard.ts b/x-pack/performance/journeys_e2e/flight_dashboard.ts index 28247e9d8c51e..6216c4e07b289 100644 --- a/x-pack/performance/journeys_e2e/flight_dashboard.ts +++ b/x-pack/performance/journeys_e2e/flight_dashboard.ts @@ -5,11 +5,15 @@ * 2.0. */ -import { createDashboardJourney } from './utils/dashboard_journey'; +import { Journey } from '@kbn/journeys'; +import { setupDashboardJourney } from './utils/dashboard_journey'; -export const journey = createDashboardJourney({ - esArchives: ['x-pack/performance/es_archives/sample_data_flights_many_fields'], - kbnArchives: ['x-pack/performance/kbn_archives/flights_no_map_dashboard'], +export const journey = setupDashboardJourney({ + // call the journey constructor in this file so the name is set correctly + journey: new Journey({ + esArchives: ['x-pack/performance/es_archives/sample_data_flights_many_fields'], + kbnArchives: ['x-pack/performance/kbn_archives/flights_no_map_dashboard'], + }), dashboardName: 'Flights Dashboard', dashboardLinkSubj: 'dashboardListingTitleLink-[Flights]-Global-Flight-Dashboard', visualizationCount: 14, diff --git a/x-pack/performance/journeys_e2e/utils/dashboard_journey.ts b/x-pack/performance/journeys_e2e/utils/dashboard_journey.ts index 3f8d33084ff18..bf6a0abda94f2 100644 --- a/x-pack/performance/journeys_e2e/utils/dashboard_journey.ts +++ b/x-pack/performance/journeys_e2e/utils/dashboard_journey.ts @@ -6,14 +6,13 @@ */ import type { KibanaServer } from '@kbn/ftr-common-functional-services'; -import { Journey } from '@kbn/journeys'; +import type { Journey } from '@kbn/journeys'; import type { KibanaPage } from '@kbn/journeys/services/page/kibana_page'; import { subj } from '@kbn/test-subj-selector'; import type { Page } from 'playwright'; interface DashboardJourneyConfig { - esArchives: string[]; - kbnArchives: string[]; + journey: Journey<{}>; dashboardName: string; dashboardLinkSubj: string; setup?: (kibanaServer: KibanaServer) => Promise; @@ -21,7 +20,7 @@ interface DashboardJourneyConfig { loadCompleteAwaiter?: (page: Page, kibanaPage: KibanaPage) => Promise; } -export function createDashboardJourney(config: DashboardJourneyConfig): Journey<{}> { +export function setupDashboardJourney(config: DashboardJourneyConfig): Journey<{}> { const waitForDashboardLoad = async (page: Page, kibanaPage: KibanaPage) => { if (config.visualizationCount) { await kibanaPage.waitForVisualizations({ count: config.visualizationCount }); @@ -34,18 +33,13 @@ export function createDashboardJourney(config: DashboardJourneyConfig): Journey< } }; - const journey = new Journey({ - esArchives: config.esArchives, - kbnArchives: config.kbnArchives, - }); - if (config.setup) { - journey.step('Setup', async ({ kibanaServer }) => { + config.journey.step('Setup', async ({ kibanaServer }) => { await config.setup!(kibanaServer); }); } - return journey + return config.journey .step('Go to Dashboards Page', async ({ page, kbnUrl, kibanaPage }) => { await page.goto(kbnUrl.get(`/app/dashboards`)); await kibanaPage.waitForListViewTable(); diff --git a/x-pack/performance/journeys_e2e/web_logs_dashboard.ts b/x-pack/performance/journeys_e2e/web_logs_dashboard.ts index f47d48933d750..1a577f3b99b8e 100644 --- a/x-pack/performance/journeys_e2e/web_logs_dashboard.ts +++ b/x-pack/performance/journeys_e2e/web_logs_dashboard.ts @@ -5,11 +5,15 @@ * 2.0. */ -import { createDashboardJourney } from './utils/dashboard_journey'; +import { Journey } from '@kbn/journeys'; +import { setupDashboardJourney } from './utils/dashboard_journey'; -export const journey = createDashboardJourney({ - esArchives: ['x-pack/performance/es_archives/sample_data_logs_many_fields'], - kbnArchives: ['x-pack/performance/kbn_archives/logs_no_map_dashboard'], +export const journey = setupDashboardJourney({ + // call the journey constructor in this file so the name is set correctly + journey: new Journey({ + esArchives: ['x-pack/performance/es_archives/sample_data_logs_many_fields'], + kbnArchives: ['x-pack/performance/kbn_archives/logs_no_map_dashboard'], + }), dashboardName: 'Web Logs Dashboard', dashboardLinkSubj: 'dashboardListingTitleLink-[Logs]-Web-Traffic', visualizationCount: 11, diff --git a/x-pack/performance/journeys_e2e/web_logs_dashboard_esql.ts b/x-pack/performance/journeys_e2e/web_logs_dashboard_esql.ts index dc6ad51e14164..6c305cdedeed5 100644 --- a/x-pack/performance/journeys_e2e/web_logs_dashboard_esql.ts +++ b/x-pack/performance/journeys_e2e/web_logs_dashboard_esql.ts @@ -5,11 +5,15 @@ * 2.0. */ -import { createDashboardJourney } from './utils/dashboard_journey'; +import { Journey } from '@kbn/journeys'; +import { setupDashboardJourney } from './utils/dashboard_journey'; -export const journey = createDashboardJourney({ - esArchives: ['x-pack/performance/es_archives/sample_data_logs_many_fields'], - kbnArchives: ['x-pack/performance/kbn_archives/logs_no_map_dashboard_esql'], +export const journey = setupDashboardJourney({ + // call the journey constructor in this file so the name is set correctly + journey: new Journey({ + esArchives: ['x-pack/performance/es_archives/sample_data_logs_many_fields'], + kbnArchives: ['x-pack/performance/kbn_archives/logs_no_map_dashboard_esql'], + }), dashboardName: 'Web Logs Dashboard', dashboardLinkSubj: 'dashboardListingTitleLink-Logs-dashboard-with-ES|QL', visualizationCount: 11, diff --git a/x-pack/performance/journeys_e2e/web_logs_dashboard_esql_long_running.ts b/x-pack/performance/journeys_e2e/web_logs_dashboard_esql_long_running.ts index 11269b3a18001..a989f03b283d1 100644 --- a/x-pack/performance/journeys_e2e/web_logs_dashboard_esql_long_running.ts +++ b/x-pack/performance/journeys_e2e/web_logs_dashboard_esql_long_running.ts @@ -5,11 +5,15 @@ * 2.0. */ -import { createDashboardJourney } from './utils/dashboard_journey'; +import { Journey } from '@kbn/journeys'; +import { setupDashboardJourney } from './utils/dashboard_journey'; -export const journey = createDashboardJourney({ - esArchives: ['x-pack/performance/es_archives/sample_data_logs_many_fields'], - kbnArchives: ['x-pack/performance/kbn_archives/logs_no_map_dashboard_esql_long_running'], +export const journey = setupDashboardJourney({ + // call the journey constructor in this file so the name is set correctly + journey: new Journey({ + esArchives: ['x-pack/performance/es_archives/sample_data_logs_many_fields'], + kbnArchives: ['x-pack/performance/kbn_archives/logs_no_map_dashboard_esql_long_running'], + }), dashboardName: 'Web Logs Dashboard', dashboardLinkSubj: 'dashboardListingTitleLink-Logs-dashboard-with-ES|QL', visualizationCount: 11, diff --git a/x-pack/performance/journeys_e2e/web_logs_dashboard_long_running.ts b/x-pack/performance/journeys_e2e/web_logs_dashboard_long_running.ts index 8f8691c078474..8119ba064a3eb 100644 --- a/x-pack/performance/journeys_e2e/web_logs_dashboard_long_running.ts +++ b/x-pack/performance/journeys_e2e/web_logs_dashboard_long_running.ts @@ -5,11 +5,15 @@ * 2.0. */ -import { createDashboardJourney } from './utils/dashboard_journey'; +import { Journey } from '@kbn/journeys'; +import { setupDashboardJourney } from './utils/dashboard_journey'; -export const journey = createDashboardJourney({ - esArchives: ['x-pack/performance/es_archives/sample_data_logs_many_fields'], - kbnArchives: ['x-pack/performance/kbn_archives/logs_no_map_dashboard_long_running'], +export const journey = setupDashboardJourney({ + // call the journey constructor in this file so the name is set correctly + journey: new Journey({ + esArchives: ['x-pack/performance/es_archives/sample_data_logs_many_fields'], + kbnArchives: ['x-pack/performance/kbn_archives/logs_no_map_dashboard_long_running'], + }), dashboardName: 'Web Logs Dashboard', dashboardLinkSubj: 'dashboardListingTitleLink-[Logs]-Web-Traffic', visualizationCount: 11, From e07425dc0a76171e62a290f0a359ae72ed647cbd Mon Sep 17 00:00:00 2001 From: Drew Tate Date: Wed, 4 Feb 2026 09:38:22 -0700 Subject: [PATCH 2/2] esql_journey --- .../journeys_e2e/data_stress_test_lens_esql.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/x-pack/performance/journeys_e2e/data_stress_test_lens_esql.ts b/x-pack/performance/journeys_e2e/data_stress_test_lens_esql.ts index 69c1ae044bfb8..8b4f2e7405383 100644 --- a/x-pack/performance/journeys_e2e/data_stress_test_lens_esql.ts +++ b/x-pack/performance/journeys_e2e/data_stress_test_lens_esql.ts @@ -5,11 +5,15 @@ * 2.0. */ -import { createDashboardJourney } from '../utils/dashboard_journey'; +import { Journey } from '@kbn/journeys'; +import { setupDashboardJourney } from '../utils/dashboard_journey'; -export const journey = createDashboardJourney({ - esArchives: ['src/platform/test/functional/fixtures/es_archiver/stress_test'], - kbnArchives: ['src/platform/test/functional/fixtures/kbn_archiver/stress_test_esql'], +export const journey = setupDashboardJourney({ + // call the journey constructor in this file so the name is set correctly + journey: new Journey({ + esArchives: ['src/platform/test/functional/fixtures/es_archiver/stress_test'], + kbnArchives: ['src/platform/test/functional/fixtures/kbn_archiver/stress_test_esql'], + }), dashboardName: 'Stress Test Dashboard', dashboardLinkSubj: 'dashboardListingTitleLink-Stresstest-(ES|QL)', visualizationCount: 1,