From 21a0527efe65fc50d3b6c4c82327d41e8227d892 Mon Sep 17 00:00:00 2001 From: Gerard Soldevila Date: Tue, 10 Dec 2024 15:35:52 +0100 Subject: [PATCH] Relocating module `@kbn/observability-utils-server` --- .github/CODEOWNERS | 2 +- package.json | 2 +- tsconfig.base.json | 4 ++-- .../observability_utils_server/entities/analyze_documents.ts | 0 .../entities/get_data_streams_for_entity.ts | 0 .../entities/signals/get_alerts_for_entity.ts | 0 .../entities/signals/get_anomalies_for_entity.ts | 0 .../entities/signals/get_slos_for_entity.ts | 0 .../es/client/create_observability_es_client.ts | 0 .../es/esql_result_to_plain_objects.test.ts | 0 .../es/esql_result_to_plain_objects.ts | 0 .../es/queries/exclude_frozen_query.ts | 0 .../observability_utils_server/es/queries/kql_query.ts | 0 .../observability_utils_server/es/queries/range_query.ts | 0 .../observability_utils_server/es/queries/term_query.ts | 0 .../observability_utils_server/jest.config.js | 4 ++-- .../observability_utils_server/kibana.jsonc | 0 .../observability_utils_server/package.json | 0 .../observability_utils_server/tsconfig.json | 2 +- yarn.lock | 2 +- 20 files changed, 8 insertions(+), 8 deletions(-) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/entities/analyze_documents.ts (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/entities/get_data_streams_for_entity.ts (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/entities/signals/get_alerts_for_entity.ts (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/entities/signals/get_anomalies_for_entity.ts (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/entities/signals/get_slos_for_entity.ts (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/es/client/create_observability_es_client.ts (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/es/esql_result_to_plain_objects.test.ts (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/es/esql_result_to_plain_objects.ts (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/es/queries/exclude_frozen_query.ts (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/es/queries/kql_query.ts (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/es/queries/range_query.ts (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/es/queries/term_query.ts (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/jest.config.js (67%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/kibana.jsonc (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/package.json (100%) rename x-pack/{packages/observability => solutions/observability/packages}/observability_utils/observability_utils_server/tsconfig.json (90%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8011aa529bb17..1d333ea1a9bfc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -800,7 +800,6 @@ x-pack/packages/observability/alerting_rule_utils @elastic/obs-ux-management-tea x-pack/packages/observability/alerting_test_data @elastic/obs-ux-management-team x-pack/packages/observability/get_padded_alert_time_range_util @elastic/obs-ux-management-team 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/observability/synthetics_test_data @elastic/obs-ux-management-team x-pack/packages/rollup @elastic/kibana-management x-pack/packages/search/shared_ui @elastic/search-kibana @@ -994,6 +993,7 @@ x-pack/plugins/upgrade_assistant @elastic/kibana-management x-pack/plugins/watcher @elastic/kibana-management 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/plugins/observability_shared @elastic/observability-ui x-pack/solutions/observability/plugins/observability_solution/entities_data_access @elastic/obs-entities x-pack/solutions/observability/plugins/observability_solution/entity_manager_app @elastic/obs-entities diff --git a/package.json b/package.json index 9cf59814f3f68..82a29f01f5b55 100644 --- a/package.json +++ b/package.json @@ -708,7 +708,7 @@ "@kbn/observability-synthetics-test-data": "link:x-pack/packages/observability/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 7ac94bff58285..ba9c94835eed9 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1350,8 +1350,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/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 90% 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 f6dd781184b86..e1aa49be11b2b 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 27bd322d0e82e..7d162a4de972b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6516,7 +6516,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 ""