diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 46cbd275460be..83ddf30e9d9a5 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -782,7 +782,6 @@ x-pack/packages/kbn-random-sampling @elastic/kibana-visualizations x-pack/packages/kbn-synthetics-private-location @elastic/obs-ux-management-team x-pack/packages/maps/vector_tile_utils @elastic/kibana-presentation x-pack/packages/observability/logs_overview @elastic/obs-ux-logs-team -x-pack/packages/observability/observability_utils/observability_utils_server @elastic/observability-ui x-pack/packages/search/shared_ui @elastic/search-kibana x-pack/packages/security/api_key_management @elastic/kibana-security x-pack/packages/security/authorization_core @elastic/kibana-security @@ -959,6 +958,7 @@ x-pack/solutions/observability/packages/observability_ai/observability_ai_common x-pack/solutions/observability/packages/observability_ai/observability_ai_server @elastic/obs-ai-assistant x-pack/solutions/observability/packages/observability_utils/observability_utils_browser @elastic/observability-ui x-pack/solutions/observability/packages/observability_utils/observability_utils_common @elastic/observability-ui +x-pack/solutions/observability/packages/observability_utils/observability_utils_server @elastic/observability-ui x-pack/solutions/observability/packages/synthetics_test_data @elastic/obs-ux-management-team x-pack/solutions/observability/plugins/exploratory_view @elastic/obs-ux-management-team x-pack/solutions/observability/plugins/investigate @elastic/obs-ux-management-team diff --git a/package.json b/package.json index 8da9775b0424c..a71ee7623bdc9 100644 --- a/package.json +++ b/package.json @@ -710,7 +710,7 @@ "@kbn/observability-synthetics-test-data": "link:x-pack/solutions/observability/packages/synthetics_test_data", "@kbn/observability-utils-browser": "link:x-pack/solutions/observability/packages/observability_utils/observability_utils_browser", "@kbn/observability-utils-common": "link:x-pack/solutions/observability/packages/observability_utils/observability_utils_common", - "@kbn/observability-utils-server": "link:x-pack/packages/observability/observability_utils/observability_utils_server", + "@kbn/observability-utils-server": "link:x-pack/solutions/observability/packages/observability_utils/observability_utils_server", "@kbn/oidc-provider-plugin": "link:x-pack/test/security_api_integration/plugins/oidc_provider", "@kbn/open-telemetry-instrumented-plugin": "link:test/common/plugins/otel_metrics", "@kbn/openapi-common": "link:packages/kbn-openapi-common", diff --git a/tsconfig.base.json b/tsconfig.base.json index c113e6fa301db..08b86c6b0bae4 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1356,8 +1356,8 @@ "@kbn/observability-utils-browser/*": ["x-pack/solutions/observability/packages/observability_utils/observability_utils_browser/*"], "@kbn/observability-utils-common": ["x-pack/solutions/observability/packages/observability_utils/observability_utils_common"], "@kbn/observability-utils-common/*": ["x-pack/solutions/observability/packages/observability_utils/observability_utils_common/*"], - "@kbn/observability-utils-server": ["x-pack/packages/observability/observability_utils/observability_utils_server"], - "@kbn/observability-utils-server/*": ["x-pack/packages/observability/observability_utils/observability_utils_server/*"], + "@kbn/observability-utils-server": ["x-pack/solutions/observability/packages/observability_utils/observability_utils_server"], + "@kbn/observability-utils-server/*": ["x-pack/solutions/observability/packages/observability_utils/observability_utils_server/*"], "@kbn/oidc-provider-plugin": ["x-pack/test/security_api_integration/plugins/oidc_provider"], "@kbn/oidc-provider-plugin/*": ["x-pack/test/security_api_integration/plugins/oidc_provider/*"], "@kbn/open-telemetry-instrumented-plugin": ["test/common/plugins/otel_metrics"], diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/entities/analyze_documents.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/analyze_documents.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/entities/analyze_documents.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/analyze_documents.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/entities/get_data_streams_for_entity.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/get_data_streams_for_entity.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/entities/get_data_streams_for_entity.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/get_data_streams_for_entity.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/entities/get_entities_by_fuzzy_search.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/get_entities_by_fuzzy_search.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/entities/get_entities_by_fuzzy_search.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/get_entities_by_fuzzy_search.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/entities/get_log_patterns.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/get_log_patterns.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/entities/get_log_patterns.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/get_log_patterns.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/entities/signals/get_alerts_for_entity.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/signals/get_alerts_for_entity.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/entities/signals/get_alerts_for_entity.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/signals/get_alerts_for_entity.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/entities/signals/get_anomalies_for_entity.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/signals/get_anomalies_for_entity.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/entities/signals/get_anomalies_for_entity.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/signals/get_anomalies_for_entity.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/entities/signals/get_slos_for_entity.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/signals/get_slos_for_entity.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/entities/signals/get_slos_for_entity.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/entities/signals/get_slos_for_entity.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/es/client/create_observability_es_client.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/client/create_observability_es_client.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/es/client/create_observability_es_client.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/client/create_observability_es_client.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/es/esql_result_to_plain_objects.test.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/esql_result_to_plain_objects.test.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/es/esql_result_to_plain_objects.test.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/esql_result_to_plain_objects.test.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/es/esql_result_to_plain_objects.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/esql_result_to_plain_objects.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/es/esql_result_to_plain_objects.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/esql_result_to_plain_objects.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/es/queries/exclude_frozen_query.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/queries/exclude_frozen_query.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/es/queries/exclude_frozen_query.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/queries/exclude_frozen_query.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/es/queries/kql_query.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/queries/kql_query.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/es/queries/kql_query.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/queries/kql_query.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/es/queries/range_query.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/queries/range_query.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/es/queries/range_query.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/queries/range_query.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/es/queries/term_query.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/queries/term_query.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/es/queries/term_query.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/es/queries/term_query.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/jest.config.js b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/jest.config.js similarity index 67% rename from x-pack/packages/observability/observability_utils/observability_utils_server/jest.config.js rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/jest.config.js index 5a52de35fcd06..44aa3c80c1307 100644 --- a/x-pack/packages/observability/observability_utils/observability_utils_server/jest.config.js +++ b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/jest.config.js @@ -7,6 +7,6 @@ module.exports = { preset: '@kbn/test', - rootDir: '../../../../..', - roots: ['/x-pack/packages/observability/observability_utils/observability_utils_server'], + rootDir: '../../../../../..', + roots: ['/x-pack/solutions/observability/packages/observability_utils/observability_utils_server'], }; diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/kibana.jsonc b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/kibana.jsonc similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/kibana.jsonc rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/kibana.jsonc diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/package.json b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/package.json similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_server/package.json rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/package.json diff --git a/x-pack/packages/observability/observability_utils/observability_utils_server/tsconfig.json b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/tsconfig.json similarity index 91% rename from x-pack/packages/observability/observability_utils/observability_utils_server/tsconfig.json rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_server/tsconfig.json index 33d7e75322f00..cd31ba7006058 100644 --- a/x-pack/packages/observability/observability_utils/observability_utils_server/tsconfig.json +++ b/x-pack/solutions/observability/packages/observability_utils/observability_utils_server/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../../tsconfig.base.json", + "extends": "../../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types", "types": [ diff --git a/yarn.lock b/yarn.lock index c5600cdfdd96d..cb74c18e9410c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6529,7 +6529,7 @@ version "0.0.0" uid "" -"@kbn/observability-utils-server@link:x-pack/packages/observability/observability_utils/observability_utils_server": +"@kbn/observability-utils-server@link:x-pack/solutions/observability/packages/observability_utils/observability_utils_server": version "0.0.0" uid ""