elastic · dmlemeshko · Jul 14, 2025 · Jul 13, 2025 · Jul 13, 2025 · Jul 13, 2025
@@ -37,19 +37,22 @@ enabled:
   - x-pack/solutions/observability/test/apm_api_integration/trial/config.ts
   - x-pack/test/dataset_quality_api_integration/basic/config.ts
   - x-pack/test/functional/apps/dataset_quality/config.ts
-  - x-pack/test/functional/apps/uptime/config.ts
-  - x-pack/test/observability_api_integration/basic/config.ts
-  - x-pack/test/observability_api_integration/trial/config.ts
-  - x-pack/test/observability_functional/with_rac_write.config.ts
-  - x-pack/test/observability_onboarding_api_integration/basic/config.ts
-  - x-pack/test/observability_onboarding_api_integration/cloud/config.ts
-  - x-pack/test/observability_ai_assistant_functional/enterprise/config.ts
+  - x-pack/solutions/observability/test/functional/apps/uptime/config.ts
+  - x-pack/solutions/observability/test/observability_api_integration/basic/config.ts
+  - x-pack/solutions/observability/test/observability_api_integration/trial/config.ts
+  - x-pack/solutions/observability/test/observability_functional/with_rac_write.config.ts
+  - x-pack/solutions/observability/test/observability_onboarding_api_integration/basic/config.ts
+  - x-pack/solutions/observability/test/observability_onboarding_api_integration/cloud/config.ts
+  - x-pack/solutions/observability/test/observability_ai_assistant_functional/enterprise/config.ts
   - x-pack/solutions/observability/test/api_integration/profiling/cloud/config.ts
   - x-pack/test/functional/apps/apm/config.ts
-  - x-pack/test/functional_with_es_ssl/apps/config.ts
+  - x-pack/solutions/observability/test/functional_with_es_ssl/config.ts
   - x-pack/solutions/observability/test/api_integration/apis/cases/config.ts
   - x-pack/solutions/observability/test/functional/apps/slo/embeddables/config.ts
   - x-pack/solutions/observability/test/api_integration/apis/security/config.ts
+  - x-pack/solutions/observability/test/accessibility/config.ts
+  - x-pack/solutions/observability/test/functional/apps/infra/config.ts
+  - x-pack/solutions/observability/test/functional/config.firefox.ts
   # stateful configs that run deployment-agnostic tests
   - x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.stateful.config.ts
   - x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts

@@ -24,7 +24,6 @@ disabled:
   - x-pack/platform/test/upgrade/config.ts
   - src/platform/test/functional/config.edge.js
   - x-pack/platform/test/functional/config.edge.ts
-  - x-pack/test/functional/config.edge.js
 
   # Configs that exist but weren't running in CI when this file was introduced
   - x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts
@@ -217,7 +216,6 @@ enabled:
   - x-pack/test/functional/apps/home/config.ts
   - x-pack/test/functional/apps/index_lifecycle_management/config.ts
   - x-pack/test/functional/apps/index_management/config.ts
-  - x-pack/test/functional/apps/infra/config.ts
   - x-pack/test/functional/apps/ingest_pipelines/config.ts
   - x-pack/test/functional/apps/lens/group1/config.ts
   - x-pack/test/functional/apps/lens/group2/config.ts
@@ -270,7 +268,6 @@ enabled:
   - x-pack/platform/test/functional/apps/watcher/config.ts
   - x-pack/platform/test/functional/config_security_basic.ts
   - x-pack/test/functional/config.ccs.ts
-  - x-pack/test/functional/config.firefox.js
   - x-pack/platform/test/functional/config.firefox.ts
   - x-pack/platform/test/functional/config.upgrade_assistant.ts
   - x-pack/platform/test/functional_cloud/config.ts

@@ -779,9 +779,11 @@ module.exports = {
         'x-pack/platform/test/*/{tests,test_suites,apis,apps}/**/*',
         'x-pack/platform/test/*api_integration*/**/*',
         'x-pack/platform/test/*/*config.*ts',
-        'x-pack/solutions/*/test/**/{tests,test_suites,apis,apps,fixtures}/**/*',
-        'x-pack/solutions/*/test/*api_integration*/**/*',
-        'x-pack/solutions/*/test/**/*config.*ts',
+        'x-pack/solutions/*/test/**/{tests,test_suites,apis,apps,fixtures,index.ts}/**/*',
+        'x-pack/solutions/*/test/**/*config*.ts',
+        'x-pack/solutions/*/test/**/tests/**/*',
+        'x-pack/solutions/*/test/api_integration_deployment_agnostic/*configs/**/*',
+        'x-pack/solutions/*/test/alerting_api_integration/**/*',
         'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',
         'x-pack/test/*/*config.*ts',
         'x-pack/platform/test/saved_object_api_integration/*/apis/**/*',

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/paths-labeller.yml b/.github/paths-labeller.yml
@@ -26,7 +26,7 @@
 - 'Team:Obs AI Assistant':
     - 'x-pack/platform/plugins/shared/observability_ai_assistant/**/*.*'
     - 'x-pack/plugins/observability_solution/observability_ai_assistant_*/**/*.*'
-    - 'x-pack/test/observability_ai_assistant_functional/**/*.*'
+    - 'x-pack/solutions/observability/test/observability_ai_assistant_functional/**/*.*'
 - 'ci:project-deploy-observability':
     - 'packages/kbn-apm-*/**/*.*'
     - 'src/platform/plugins/shared/ai_assistant_management/**/*.*'

@@ -32,7 +32,7 @@ Wait timed out after 10055ms
     at process._tickCallback (internal/process/next_tick.js:68:7) name: 'NoSuchSessionError', remoteStacktrace: '' }]]>
       </failure>
     </testcase>
-    <testcase name="InfraOps app feature controls infrastructure security global infrastructure all privileges shows infrastructure navlink" classname="Chrome X-Pack UI Functional Tests.x-pack/test/functional/apps/infra/feature_controls/infrastructure_security·ts" owners="elastic/kibana-presentation">
+    <testcase name="InfraOps app feature controls infrastructure security global infrastructure all privileges shows infrastructure navlink" classname="Chrome X-Pack UI Functional Tests.x-pack/solutions/observability/test/functional/apps/infra/feature_controls/infrastructure_security·ts" owners="elastic/kibana-presentation">
       <system-out>
         <![CDATA[[00:00:00]       │
 [00:05:13]         └-: InfraOps app

@@ -106,7 +106,7 @@ it('rewrites ftr reports with minimal changes', async () => {
     +    at process._tickCallback (internal/process/next_tick.js:68:7) name: 'NoSuchSessionError', remoteStacktrace: '' }
            ‹/failure›
          ‹/testcase›
-         ‹testcase name="InfraOps app feature controls infrastructure security global infrastructure all privileges shows infrastructure navlink" classname="Chrome X-Pack UI Functional Tests.x-pack/test/functional/apps/infra/feature_controls/infrastructure_security·ts" owners="elastic/kibana-presentation"›
+         ‹testcase name="InfraOps app feature controls infrastructure security global infrastructure all privileges shows infrastructure navlink" classname="Chrome X-Pack UI Functional Tests.x-pack/solutions/observability/test/functional/apps/infra/feature_controls/infrastructure_security·ts" owners="elastic/kibana-presentation"›
            ‹system-out›
     -        ‹![CDATA[[00:00:00]       │
     +        [00:00:00]       │

@@ -25,6 +25,7 @@ import { SearchSessionsPageProvider } from './search_sessions_management_page';
 import { GraphPageObject } from './graph_page';
 import { MaintenanceWindowsPageProvider } from './maintenance_windows_page';
 import { BannersPageObject } from './banners_page';
+import { NavigationalSearchPageObject } from './navigational_search';
 
 // just like services, PageObjects are defined as a map of
 // names to Providers. Merge in Kibana's or pick specific ones
@@ -49,4 +50,5 @@ export const pageObjects = {
   userProfiles: UserProfilePageProvider,
   maintenanceWindows: MaintenanceWindowsPageProvider,
   banners: BannersPageObject,
+  navigationalSearch: NavigationalSearchPageObject,
 };
@@ -13,12 +13,12 @@ xpack.ruleRegistry.write.enabled: true
 
 When this is set to `true`, your alerts should show on the alerts page.
 
-
 ## Shared navigation
 
 The Observability plugin maintains a navigation registry for Observability solutions, and exposes a shared page template component. Please refer to the docs in [the component directory](public/components/shared/page_template) for more information on registering your solution's navigation structure, and rendering the navigation via the shared component.
 
 ## Exploratory view component
+
 A shared component for visualizing observability data types via lens embeddable. [For further details.](./public/components/shared/exploratory_view/README.md)
 
 ## Unit testing
@@ -58,25 +58,25 @@ This requires separate test servers and test runners.
 
 ```
 # Start server
-node scripts/functional_tests_server --config x-pack/test/observability_api_integration/basic/config.ts
+node scripts/functional_tests_server --config x-pack/solutions/observability/test/observability_api_integration/basic/config.ts
 
 # Run tests
-node scripts/functional_test_runner --config x-pack/test/observability_api_integration/basic/config.ts
+node scripts/functional_test_runner --config x-pack/solutions/observability/test/observability_api_integration/basic/config.ts
 ```
 
-The API tests for "basic" are located in `x-pack/test/observability_api_integration/basic/tests`.
+The API tests for "basic" are located in `x-pack/solutions/observability/test/observability_api_integration/basic/tests`.
 
 ### Trial
 
 ```
 # Start server
-node scripts/functional_tests_server --config x-pack/test/observability_api_integration/trial/config.ts
+node scripts/functional_tests_server --config x-pack/solutions/observability/test/observability_api_integration/trial/config.ts
 
 # Run tests
-node scripts/functional_test_runner --config x-pack/test/observability_api_integration/trial/config.ts
+node scripts/functional_test_runner --config x-pack/solutions/observability/test/observability_api_integration/trial/config.ts
 ```
 
-The API tests for "trial" are located in `x-pack/test/observability_api_integration/trial/tests`.
+The API tests for "trial" are located in `x-pack/solutions/observability/test/observability_api_integration/trial/tests`.
 
 ### API test tips
 

@@ -56,20 +56,20 @@ node scripts/functional_test_runner --config x-pack/solutions/observability/test
 
 ```sh
 # start server
-yarn test:ftr:server --config ./x-pack/test/observability_onboarding_api_integration/basic/config.ts
+yarn test:ftr:server --config ./x-pack/solutions/observability/test/observability_onboarding_api_integration/basic/config.ts
 
 # run tests
-yarn test:ftr:runner --config ./x-pack/test/observability_onboarding_api_integration/basic/config.ts --include ./x-pack/test/observability_onboarding_api_integration/tests/index.ts
+yarn test:ftr:runner --config ./x-pack/solutions/observability/test/observability_onboarding_api_integration/basic/config.ts --include ./x-pack/solutions/observability/test/observability_onboarding_api_integration/tests/index.ts
 ```
 
 #### Cloud config
 
 ```sh
 # start server
-yarn test:ftr:server --config ./x-pack/test/observability_onboarding_api_integration/cloud/config.ts
+yarn test:ftr:server --config ./x-pack/solutions/observability/test/observability_onboarding_api_integration/cloud/config.ts
 
 # run tests
-yarn test:ftr:runner --config ./x-pack/test/observability_onboarding_api_integration/cloud/config.ts --include ./x-pack/test/observability_onboarding_api_integration/tests/index.ts
+yarn test:ftr:runner --config ./x-pack/solutions/observability/test/observability_onboarding_api_integration/cloud/config.ts --include ./x-pack/solutions/observability/test/observability_onboarding_api_integration/tests/index.ts
 ```
 
 ### Functional Tests

@@ -83,7 +83,7 @@ const cmd = [
   `${REPO_ROOT}/scripts/${ftrScript}`,
   ...(grep ? [`--grep "${grep}"`] : []),
   ...(updateSnapshots ? [`--updateSnapshots`] : []),
-  `--config ${REPO_ROOT}/x-pack/test/observability_onboarding_api_integration/${license}/config.ts`,
+  `--config ${REPO_ROOT}/x-pack/solutions/observability/test/observability_onboarding_api_integration/${license}/config.ts`,
 ].join(' ');
 
 console.log(`Running: "${cmd}"`);

@@ -0,0 +1,15 @@
+/*
+ * 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 { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('X-Pack Observability Accessibility Tests', function () {
+    loadTestFile(require.resolve('./uptime'));
+    loadTestFile(require.resolve('./observability'));
+  });
+}
@@ -6,7 +6,7 @@
  */
 
 // a11y tests for spaces, space selection and space creation and feature controls
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common', 'infraHome']);

@@ -6,8 +6,8 @@
  */
 
 import moment from 'moment';
-import { makeChecks } from '../../../common/utils/uptime/helper/make_checks';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { makeChecks } from '../../api_integration/apis/uptime/rest/helper/make_checks';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 const A11Y_TEST_MONITOR_ID = 'a11yTestMonitor';
 

@@ -0,0 +1,27 @@
+/*
+ * 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 { FtrConfigProviderContext } from '@kbn/test';
+import { services } from './services';
+import { pageObjects } from './page_objects';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../functional/config.base.ts'));
+
+  return {
+    ...functionalConfig.getAll(),
+
+    testFiles: [require.resolve('./apps')],
+
+    pageObjects,
+    services,
+
+    junit: {
+      reportName: 'X-Pack Observability Accessibility Tests',
+    },
+  };
+}
@@ -0,0 +1,13 @@
+/*
+ * 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 { GenericFtrProviderContext } from '@kbn/test';
+
+import { pageObjects } from './page_objects';
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
@@ -0,0 +1,8 @@
+/*
+ * 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.
+ */
+
+export { pageObjects } from '../functional/page_objects';
@@ -0,0 +1,14 @@
+/*
+ * 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 { services as kibanaA11yServices } from '@kbn/test-suites-src/accessibility/services';
+import { services as functionalServices } from '../functional/services';
+
+export const services = {
+  ...kibanaA11yServices,
+  ...functionalServices,
+};
@@ -8,7 +8,7 @@
 import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
-  const functionalConfig = await readConfigFile(require.resolve('../../config.base.js'));
+  const functionalConfig = await readConfigFile(require.resolve('../../config.base.ts'));
 
   return {
     ...functionalConfig.getAll(),

@@ -11,11 +11,12 @@ import { Aggregators, MetricThresholdParams } from '@kbn/infra-plugin/common/ale
 
 import { COMPARATORS } from '@kbn/alerting-comparators';
 import { InfraRuleType } from '@kbn/rule-data-utils';
-import { createRule } from '../../../common/utils/observability/alerting_api_helper';
+import { createRule } from '../../../alerting_api_integration/observability/helpers/alerting_api_helper';
 import {
   waitForDocumentInIndex,
   waitForRuleStatus,
-} from '../../../common/utils/observability/alerting_wait_for_helpers';
+} from '../../../alerting_api_integration/observability/helpers/alerting_wait_for_helpers';
+
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { DATES } from './constants';
 

@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { makeCheck } from '../../../common/utils/uptime/helper/make_checks';
-import { getSha256 } from '../../../common/utils/uptime/helper/make_tls';
+import { makeCheck } from '../../../api_integration/apis/uptime/rest/helper/make_checks';
+import { getSha256 } from '../../../api_integration/apis/uptime/rest/helper/make_tls';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { UPTIME_HEARTBEAT_DATA } from './overview';
 

@@ -8,7 +8,7 @@
 import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
-  const baseIntegrationTestsConfig = await readConfigFile(require.resolve('../../config.base.js'));
+  const baseIntegrationTestsConfig = await readConfigFile(require.resolve('../../config.base.ts'));
 
   return {
     ...baseIntegrationTestsConfig.getAll(),

@@ -5,45 +5,18 @@
  * 2.0.
  */
 
-import {
-  settingsObjectType,
-  settingsObjectId,
-} from '@kbn/uptime-plugin/server/legacy_uptime/lib/saved_objects/uptime_settings';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 const ARCHIVE = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
 
-export const deleteUptimeSettingsObject = async (server: any) => {
-  // delete the saved object
-  try {
-    await server.savedObjects.delete({
-      type: settingsObjectType,
-      id: settingsObjectId,
-    });
-  } catch (e) {
-    // a 404 just means the doc is already missing
-    if (e.response.status !== 404) {
-      const { status, statusText, data, headers, config } = e.response;
-      throw new Error(
-        `error attempting to delete settings:\n${JSON.stringify(
-          { status, statusText, data, headers, config },
-          null,
-          2
-        )}`
-      );
-    }
-  }
-};
-
 export default ({ loadTestFile, getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
-  const server = getService('kibanaServer');
   const uptime = getService('uptime');
 
   describe('Uptime app', function () {
     beforeEach('delete settings', async () => {
-      await deleteUptimeSettingsObject(server);
+      await uptime.common.deleteUptimeSettingsObject();
     });
 
     describe('with generated data', () => {

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { makeCheck } from '../../../common/utils/uptime/helper/make_checks';
+import { makeCheck } from '../../../api_integration/apis/uptime/rest/helper/make_checks';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {