Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .buildkite/ftr_oblt_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ enabled:
- x-pack/solutions/observability/test/apm_api_integration/rules/config.ts
- x-pack/solutions/observability/test/apm_api_integration/trial/config.ts
- x-pack/solutions/observability/test/dataset_quality_api_integration/basic/config.ts
- x-pack/test/functional/apps/dataset_quality/config.ts
- x-pack/solutions/observability/test/functional/apps/dataset_quality/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
Expand All @@ -46,7 +46,7 @@ enabled:
- 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/solutions/observability/test/functional/apps/apm/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
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/ftr_platform_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ enabled:
- x-pack/platform/test/functional/apps/ml/short_tests/config.ts
- x-pack/platform/test/functional/apps/ml/stack_management_jobs/config.ts
- x-pack/platform/test/functional/apps/ml/memory_usage/config.ts
- x-pack/test/functional/apps/monitoring/config.ts
- x-pack/platform/test/functional/apps/monitoring/config.ts
- x-pack/platform/test/functional/apps/painless_lab/config.ts
- x-pack/platform/test/functional/apps/remote_clusters/config.ts
- x-pack/platform/test/functional/apps/reporting_management/config.ts
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/ftr_search_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ disabled:
defaultQueue: 'n2-4-spot'
enabled:
- x-pack/solutions/search/test/functional_search/config.ts
- x-pack/test/functional/apps/search_playground/config.ts
- x-pack/solutions/search/test/functional/apps/search_playground/config.ts
- x-pack/solutions/search/test/functional/config/config.feature_flags.ts
- x-pack/solutions/search/test/api_integration/apis/search_playground/config.ts
- x-pack/solutions/search/test/api_integration/apis/guided_onboarding/config.ts
Expand Down
12 changes: 7 additions & 5 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -1496,8 +1496,8 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/x-pack/platform/test/monitoring_api_integration @elastic/stack-monitoring
/x-pack/platform/test/functional/page_objects/monitoring_page.ts @elastic/stack-monitoring
/x-pack/test/functional/es_archives/monitoring @elastic/stack-monitoring
/x-pack/test/functional/services/monitoring @elastic/stack-monitoring
/x-pack/test/functional/apps/monitoring @elastic/stack-monitoring
/x-pack/platform/test/functional/services/monitoring @elastic/stack-monitoring
/x-pack/platform/test/functional/apps/monitoring @elastic/stack-monitoring
/x-pack/platform/test/api_integration/apis/monitoring @elastic/stack-monitoring
/x-pack/platform/test/api_integration/apis/monitoring_collection @elastic/stack-monitoring
/x-pack/test/accessibility/apps/group1/kibana_overview.ts @elastic/stack-monitoring
Expand All @@ -1524,7 +1524,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/x-pack/platform/test/api_integration/services/apm_synthtrace_kibana_client.ts @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
/x-pack/platform/test/stack_functional_integration/apps/apm @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
/src/platform/test/api_integration/apis/ui_metric/*.ts @elastic/obs-ux-infra_services-team
/x-pack/test/functional/apps/apm/ @elastic/obs-ux-infra_services-team
/x-pack/solutions/observability/test/functional/apps/apm/ @elastic/obs-ux-infra_services-team
/x-pack/solutions/observability/test/api_integration/apm/ @elastic/obs-ux-infra_services-team
/x-pack/solutions/observability/test/apm_cypress/ @elastic/obs-ux-infra_services-team
/src/apm.js @elastic/kibana-core @vigneshshanmugam
Expand Down Expand Up @@ -1563,12 +1563,14 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/x-pack/test_serverless/functional/test_suites/observability/landing_page.ts @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/test_suites/observability/navigation.ts @elastic/obs-ux-logs-team
/x-pack/test/functional/page_objects/dataset_quality.ts @elastic/obs-ux-logs-team
/x-pack/solutions/observability/test/functional/page_objects/dataset_quality.ts @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/test_suites/observability/index* @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/test_suites/observability/cypress @elastic/obs-ux-logs-team
/x-pack/test/functional/services/infra_source_configuration_form.ts @elastic/obs-ux-infra_services-team
/x-pack/solutions/observability/test/functional/services/infra_source_configuration_form.ts @elastic/obs-ux-infra_services-team
/x-pack/solutions/observability/test/functional/services/logs_ui @elastic/obs-ux-logs-team
/x-pack/test/functional/page_objects/observability_logs_explorer.ts @elastic/obs-ux-logs-team
/x-pack/solutions/observability/test/functional/page_objects/observability_logs_explorer.ts @elastic/obs-ux-logs-team
/src/platform/test/functional/services/selectable.ts @elastic/obs-ux-logs-team
/x-pack/solutions/observability/test/observability_onboarding_api_integration @elastic/obs-ux-logs-team
/x-pack/test_serverless/api_integration/test_suites/observability/index.feature_flags.ts @elastic/obs-ux-logs-team
Expand All @@ -1577,7 +1579,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/x-pack/test_serverless/api_integration/test_suites/observability/dataset_quality_api_integration @elastic/obs-ux-logs-team
/x-pack/test/functional/apps/observability_logs_explorer @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/test_suites/observability/observability_logs_explorer @elastic/obs-ux-logs-team
/x-pack/test/functional/apps/dataset_quality @elastic/obs-ux-logs-team
/x-pack/solutions/observability/test/functional/apps/dataset_quality @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/test_suites/observability/dataset_quality @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/test_suites/observability/discover @elastic/obs-ux-logs-team @elastic/kibana-data-discovery
/src/platform/plugins/shared/unified_doc_viewer/public/components/doc_viewer_logs_overview @elastic/obs-ux-logs-team
Expand Down Expand Up @@ -2243,7 +2245,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
/x-pack/platform/test/functional/page_objects/search_sessions_management_page.ts @elastic/search-kibana
/x-pack/test/functional/page_objects/search_* @elastic/search-kibana
x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/search-kibana
/x-pack/test/functional/apps/search_playground @elastic/search-kibana
/x-pack/solutions/search/test/functional/apps/search_playground @elastic/search-kibana
/x-pack/test_serverless/functional/page_objects/svl_ingest_pipelines.ts @elastic/search-kibana
/x-pack/platform/test/functional/apps/dev_tools/embedded_console.ts @elastic/search-kibana
/x-pack/platform/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts @elastic/search-kibana
Expand Down
6 changes: 3 additions & 3 deletions x-pack/platform/plugins/shared/dataset_quality/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,19 @@ unset FLEET_PACKAGE_REGISTRY_PORT
##### FTR Server

```
yarn test:ftr:server --config ./x-pack/test/functional/apps/dataset_quality/config.ts
yarn test:ftr:server --config ./x-pack/solutions/observability/test/functional/apps/dataset_quality/config.ts
```

##### FTR Runner

```
yarn test:ftr:runner --config ./x-pack/test/functional/apps/dataset_quality/config.ts --include ./x-pack/test/functional/apps/dataset_quality/index.ts
yarn test:ftr:runner --config ./x-pack/solutions/observability/test/functional/apps/dataset_quality/config.ts --include ./x-pack/solutions/observability/test/functional/apps/dataset_quality/index.ts
```

##### Running Individual Tests

```
yarn test:ftr:runner --config ./x-pack/test/functional/apps/dataset_quality/config.ts --include ./x-pack/test/functional/apps/dataset_quality/$1
yarn test:ftr:runner --config ./x-pack/solutions/observability/test/functional/apps/dataset_quality/config.ts --include ./x-pack/solutions/observability/test/functional/apps/dataset_quality/$1
```

#### Serverless
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
86 changes: 74 additions & 12 deletions x-pack/platform/test/functional/services/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,59 @@
* 2.0.
*/

import { services as kibanaFunctionalServices } from '@kbn/test-suites-src/functional/services';
import { services as kibanaApiIntegrationServices } from '@kbn/test-suites-src/api_integration/services';
import { services as kibanaFunctionalServices } from '@kbn/test-suites-src/functional/services';
import { services as kibanaXPackApiIntegrationServices } from '../../api_integration/services';
import { UserMenuProvider } from './user_menu';
import { ReportingFunctionalProvider } from '../../reporting_functional/services';
import { AceEditorProvider } from './ace_editor';
import { SampleDataServiceProvider } from './sample_data';
import { GrokDebuggerProvider } from './grok_debugger';
import { SearchSessionsService } from './search_sessions';
import { CasesServiceProvider } from './cases';
import { ActionsServiceProvider } from './actions';
import { AiopsProvider } from './aiops';
import { RulesServiceProvider } from './rules';
import { CanvasElementProvider } from './canvas_element';
import { CasesServiceProvider } from './cases';
import { DataStreamProvider } from './data_stream';
import { GrokDebuggerProvider } from './grok_debugger';
import { MachineLearningProvider } from './ml';
import { TransformProvider } from './transform';
import { ReportingFunctionalProvider } from '../../reporting_functional/services';
import { RandomProvider } from './random';
import { PipelineListProvider } from './pipeline_list';
import { PipelineEditorProvider } from './pipeline_editor';
import { DataStreamProvider } from './data_stream';
import { PipelineListProvider } from './pipeline_list';
import { RandomProvider } from './random';
import { RulesServiceProvider } from './rules';
import { SampleDataServiceProvider } from './sample_data';
import { SearchSessionsService } from './search_sessions';
import { TransformProvider } from './transform';
import { UserMenuProvider } from './user_menu';

import {
MonitoringAlertsProvider,
MonitoringBeatDetailProvider,
MonitoringBeatsListingProvider,
MonitoringBeatsOverviewProvider,
MonitoringBeatsSummaryStatusProvider,
MonitoringClusterAlertsProvider,
MonitoringClusterListProvider,
MonitoringClusterOverviewProvider,
MonitoringElasticsearchIndexDetailProvider,
MonitoringElasticsearchIndicesProvider,
MonitoringElasticsearchNodeDetailProvider,
MonitoringElasticsearchNodesProvider,
MonitoringElasticsearchOverviewProvider,
MonitoringElasticsearchShardsProvider,
MonitoringElasticsearchSummaryStatusProvider,
MonitoringEnterpriseSearchOverviewProvider,
MonitoringEnterpriseSearchSummaryStatusProvider,
MonitoringKibanaInstanceProvider,
MonitoringKibanaInstancesProvider,
MonitoringKibanaOverviewProvider,
MonitoringKibanaSummaryStatusProvider,
MonitoringLogstashNodeDetailProvider,
MonitoringLogstashNodesProvider,
MonitoringLogstashOverviewProvider,
MonitoringLogstashPipelinesProvider,
MonitoringLogstashPipelineViewerProvider,
MonitoringLogstashSummaryStatusProvider,
MonitoringNoDataProvider,
MonitoringSetupModeProvider,
// @ts-ignore not ts yet
} from './monitoring';

// define the name and providers for services that should be
// available to your tests. If you don't specify anything here
Expand Down Expand Up @@ -54,4 +87,33 @@ export const services = {
pipelineList: PipelineListProvider,
pipelineEditor: PipelineEditorProvider,
dataStreams: DataStreamProvider,
monitoringNoData: MonitoringNoDataProvider,
monitoringClusterList: MonitoringClusterListProvider,
monitoringClusterOverview: MonitoringClusterOverviewProvider,
monitoringClusterAlerts: MonitoringClusterAlertsProvider,
monitoringElasticsearchSummaryStatus: MonitoringElasticsearchSummaryStatusProvider,
monitoringElasticsearchOverview: MonitoringElasticsearchOverviewProvider,
monitoringElasticsearchNodes: MonitoringElasticsearchNodesProvider,
monitoringElasticsearchNodeDetail: MonitoringElasticsearchNodeDetailProvider,
monitoringElasticsearchIndices: MonitoringElasticsearchIndicesProvider,
monitoringElasticsearchIndexDetail: MonitoringElasticsearchIndexDetailProvider,
monitoringElasticsearchShards: MonitoringElasticsearchShardsProvider,
monitoringBeatsOverview: MonitoringBeatsOverviewProvider,
monitoringBeatsListing: MonitoringBeatsListingProvider,
monitoringBeatDetail: MonitoringBeatDetailProvider,
monitoringBeatsSummaryStatus: MonitoringBeatsSummaryStatusProvider,
monitoringLogstashOverview: MonitoringLogstashOverviewProvider,
monitoringLogstashNodes: MonitoringLogstashNodesProvider,
monitoringLogstashNodeDetail: MonitoringLogstashNodeDetailProvider,
monitoringLogstashPipelines: MonitoringLogstashPipelinesProvider,
monitoringLogstashPipelineViewer: MonitoringLogstashPipelineViewerProvider,
monitoringLogstashSummaryStatus: MonitoringLogstashSummaryStatusProvider,
monitoringKibanaOverview: MonitoringKibanaOverviewProvider,
monitoringKibanaInstances: MonitoringKibanaInstancesProvider,
monitoringKibanaInstance: MonitoringKibanaInstanceProvider,
monitoringKibanaSummaryStatus: MonitoringKibanaSummaryStatusProvider,
monitoringEnterpriseSearchOverview: MonitoringEnterpriseSearchOverviewProvider,
monitoringEnterpriseSearchSummaryStatus: MonitoringEnterpriseSearchSummaryStatusProvider,
monitoringSetupMode: MonitoringSetupModeProvider,
monitoringAlerts: MonitoringAlertsProvider,
};
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,13 @@ Accessibility tests are added on the e2e with `checkA11y()`, they will run toget

```sh
# Start server
node scripts/functional_tests_server --config x-pack/test/functional/apps/apm/config.ts
node scripts/functional_tests_server --config x-pack/solutions/observability/test/functional/apps/apm/config.ts

# Run tests
node scripts/functional_test_runner --config x-pack/test/functional/apps/apm/config.ts --grep='APM specs'
node scripts/functional_test_runner --config x-pack/solutions/observability/test/functional/apps/apm/config.ts --grep='APM specs'
```

APM tests are located in `x-pack/test/functional/apps/apm`.
APM tests are located in `x-pack/solutions/observability/test/functional/apps/apm`.
For debugging access Elasticsearch on http://localhost:9220` (elastic/changeme)
diff --git a/x-pack/solutions/observability/plugins/apm/scripts/test/README.md b/x-pack/solutions/observability/plugins/apm/scripts/test/README.md

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ interface DatasetQualityConfig {
export default async function createTestConfig({
readConfigFile,
}: FtrConfigProviderContext): Promise<DatasetQualityConfig> {
const functionalConfig = await readConfigFile(require.resolve('../../config.base.js'));
const functionalConfig = await readConfigFile(require.resolve('../../config.base.ts'));
const services = functionalConfig.get('services');
const pageObjects = functionalConfig.get('pageObjects');

Expand Down
Loading