diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 85031c11756d6..46cbd275460be 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_common @elastic/observability-ui 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 @@ -959,6 +958,7 @@ x-pack/solutions/observability/packages/kbn-investigation-shared @elastic/obs-ux x-pack/solutions/observability/packages/observability_ai/observability_ai_common @elastic/obs-ai-assistant 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/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 29c20ef42f7aa..8da9775b0424c 100644 --- a/package.json +++ b/package.json @@ -709,7 +709,7 @@ "@kbn/observability-shared-plugin": "link:x-pack/solutions/observability/plugins/observability_shared", "@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/packages/observability/observability_utils/observability_utils_common", + "@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/oidc-provider-plugin": "link:x-pack/test/security_api_integration/plugins/oidc_provider", "@kbn/open-telemetry-instrumented-plugin": "link:test/common/plugins/otel_metrics", diff --git a/tsconfig.base.json b/tsconfig.base.json index 81ca0dc8f9880..c113e6fa301db 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1354,8 +1354,8 @@ "@kbn/observability-synthetics-test-data/*": ["x-pack/solutions/observability/packages/synthetics_test_data/*"], "@kbn/observability-utils-browser": ["x-pack/solutions/observability/packages/observability_utils/observability_utils_browser"], "@kbn/observability-utils-browser/*": ["x-pack/solutions/observability/packages/observability_utils/observability_utils_browser/*"], - "@kbn/observability-utils-common": ["x-pack/packages/observability/observability_utils/observability_utils_common"], - "@kbn/observability-utils-common/*": ["x-pack/packages/observability/observability_utils/observability_utils_common/*"], + "@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/oidc-provider-plugin": ["x-pack/test/security_api_integration/plugins/oidc_provider"], diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/array/join_by_key.test.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/array/join_by_key.test.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/array/join_by_key.test.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/array/join_by_key.test.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/array/join_by_key.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/array/join_by_key.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/array/join_by_key.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/array/join_by_key.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/entities/get_entity_kuery.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/entities/get_entity_kuery.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/entities/get_entity_kuery.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/entities/get_entity_kuery.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/es/format_value_for_kql.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/format_value_for_kql.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/es/format_value_for_kql.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/format_value_for_kql.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/es/queries/entity_query.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/queries/entity_query.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/es/queries/entity_query.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/queries/entity_query.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/es/queries/exclude_frozen_query.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/queries/exclude_frozen_query.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/es/queries/exclude_frozen_query.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/queries/exclude_frozen_query.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/es/queries/exclude_tiers_query.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/queries/exclude_tiers_query.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/es/queries/exclude_tiers_query.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/queries/exclude_tiers_query.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/es/queries/kql_query.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/queries/kql_query.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/es/queries/kql_query.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/queries/kql_query.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/es/queries/range_query.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/queries/range_query.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/es/queries/range_query.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/queries/range_query.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/es/queries/term_query.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/queries/term_query.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/es/queries/term_query.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/es/queries/term_query.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/format/integer.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/format/integer.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/format/integer.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/format/integer.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/jest.config.js b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/jest.config.js similarity index 67% rename from x-pack/packages/observability/observability_utils/observability_utils_common/jest.config.js rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/jest.config.js index ee68881a5863b..3c505020ae6ea 100644 --- a/x-pack/packages/observability/observability_utils/observability_utils_common/jest.config.js +++ b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/jest.config.js @@ -7,6 +7,6 @@ module.exports = { preset: '@kbn/test', - rootDir: '../../../../..', - roots: ['/x-pack/packages/observability/observability_utils/observability_utils_common'], + rootDir: '../../../../../..', + roots: ['/x-pack/solutions/observability/packages/observability_utils/observability_utils_common'], }; diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/kibana.jsonc b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/kibana.jsonc similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/kibana.jsonc rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/kibana.jsonc diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/llm/log_analysis/document_analysis.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/llm/log_analysis/document_analysis.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/llm/log_analysis/document_analysis.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/llm/log_analysis/document_analysis.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/llm/log_analysis/highlight_patterns_from_regex.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/llm/log_analysis/highlight_patterns_from_regex.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/llm/log_analysis/highlight_patterns_from_regex.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/llm/log_analysis/highlight_patterns_from_regex.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/llm/log_analysis/merge_sample_documents_with_field_caps.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/llm/log_analysis/merge_sample_documents_with_field_caps.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/llm/log_analysis/merge_sample_documents_with_field_caps.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/llm/log_analysis/merge_sample_documents_with_field_caps.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/llm/log_analysis/sort_and_truncate_analyzed_fields.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/llm/log_analysis/sort_and_truncate_analyzed_fields.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/llm/log_analysis/sort_and_truncate_analyzed_fields.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/llm/log_analysis/sort_and_truncate_analyzed_fields.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/llm/short_id_table.test.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/llm/short_id_table.test.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/llm/short_id_table.test.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/llm/short_id_table.test.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/llm/short_id_table.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/llm/short_id_table.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/llm/short_id_table.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/llm/short_id_table.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/ml/p_value_to_label.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/ml/p_value_to_label.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/ml/p_value_to_label.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/ml/p_value_to_label.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/object/flatten_object.test.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/object/flatten_object.test.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/object/flatten_object.test.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/object/flatten_object.test.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/object/flatten_object.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/object/flatten_object.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/object/flatten_object.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/object/flatten_object.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/object/merge_plain_object.test.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/object/merge_plain_object.test.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/object/merge_plain_object.test.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/object/merge_plain_object.test.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/object/merge_plain_objects.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/object/merge_plain_objects.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/object/merge_plain_objects.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/object/merge_plain_objects.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/object/unflatten_object.test.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/object/unflatten_object.test.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/object/unflatten_object.test.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/object/unflatten_object.test.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/object/unflatten_object.ts b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/object/unflatten_object.ts similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/object/unflatten_object.ts rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/object/unflatten_object.ts diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/package.json b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/package.json similarity index 100% rename from x-pack/packages/observability/observability_utils/observability_utils_common/package.json rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/package.json diff --git a/x-pack/packages/observability/observability_utils/observability_utils_common/tsconfig.json b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/tsconfig.json similarity index 86% rename from x-pack/packages/observability/observability_utils/observability_utils_common/tsconfig.json rename to x-pack/solutions/observability/packages/observability_utils/observability_utils_common/tsconfig.json index e2226268918a7..7367a05024915 100644 --- a/x-pack/packages/observability/observability_utils/observability_utils_common/tsconfig.json +++ b/x-pack/solutions/observability/packages/observability_utils/observability_utils_common/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 417c34a907d71..c5600cdfdd96d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6525,7 +6525,7 @@ version "0.0.0" uid "" -"@kbn/observability-utils-common@link:x-pack/packages/observability/observability_utils/observability_utils_common": +"@kbn/observability-utils-common@link:x-pack/solutions/observability/packages/observability_utils/observability_utils_common": version "0.0.0" uid ""