From 8dbfd415b8d63cb9112c0af419c3a5cf2bcf9c39 Mon Sep 17 00:00:00 2001 From: Gerard Soldevila Date: Tue, 10 Dec 2024 16:03:40 +0100 Subject: [PATCH] Fix paths manually --- packages/kbn-babel-preset/styled_components_files.js | 1 + .../plugins/exploratory_view/e2e/tasks/es_archiver.ts | 6 +++--- .../plugins/observability/dev_docs/feature_flags.md | 2 +- .../plugins/synthetics/e2e/tasks/es_archiver.ts | 6 +++--- .../observability/plugins/uptime/e2e/tasks/es_archiver.ts | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/kbn-babel-preset/styled_components_files.js b/packages/kbn-babel-preset/styled_components_files.js index 89b71c06d9e84..f818f1613a0fb 100644 --- a/packages/kbn-babel-preset/styled_components_files.js +++ b/packages/kbn-babel-preset/styled_components_files.js @@ -15,6 +15,7 @@ module.exports = { USES_STYLED_COMPONENTS: [ /packages[\/\\]kbn-ui-shared-deps-(npm|src)[\/\\]/, /src[\/\\]plugins[\/\\](kibana_react)[\/\\]/, + /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]/, /x-pack[\/\\]plugins[\/\\](observability_solution\/apm|beats_management|fleet|observability_solution\/infra|lists|observability_solution\/observability|observability_solution\/observability_shared|observability_solution\/exploratory_view|security_solution|timelines|observability_solution\/synthetics|observability_solution\/ux|observability_solution\/uptime)[\/\\]/, /x-pack[\/\\]test[\/\\]plugin_functional[\/\\]plugins[\/\\]resolver_test[\/\\]/, /x-pack[\/\\]packages[\/\\]elastic_assistant[\/\\]/, diff --git a/x-pack/solutions/observability/plugins/exploratory_view/e2e/tasks/es_archiver.ts b/x-pack/solutions/observability/plugins/exploratory_view/e2e/tasks/es_archiver.ts index da8c349c4c70a..b9b4886f6af1e 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/e2e/tasks/es_archiver.ts +++ b/x-pack/solutions/observability/plugins/exploratory_view/e2e/tasks/es_archiver.ts @@ -16,7 +16,7 @@ const NODE_TLS_REJECT_UNAUTHORIZED = '1'; export const esArchiverLoad = (folder: string) => { const path = Path.join(ES_ARCHIVE_DIR, folder); execSync( - `node ../../../../../scripts/es_archiver load "${path}" --config ../../../test/functional/config.base.js`, + `node ../../../../../../../scripts/es_archiver load "${path}" --config ../../../../../../test/functional/config.base.js`, { env: { ...process.env, NODE_TLS_REJECT_UNAUTHORIZED }, stdio: 'inherit' } ); }; @@ -24,14 +24,14 @@ export const esArchiverLoad = (folder: string) => { export const esArchiverUnload = (folder: string) => { const path = Path.join(ES_ARCHIVE_DIR, folder); execSync( - `node ../../../../../scripts/es_archiver unload "${path}" --config ../../../test/functional/config.base.js`, + `node ../../../../../../../scripts/es_archiver unload "${path}" --config ../../../../../../test/functional/config.base.js`, { env: { ...process.env, NODE_TLS_REJECT_UNAUTHORIZED }, stdio: 'inherit' } ); }; export const esArchiverResetKibana = () => { execSync( - `node ../../../../../scripts/es_archiver empty-kibana-index --config ../../../test/functional/config.base.js`, + `node ../../../../../../../scripts/es_archiver empty-kibana-index --config ../../../../../../test/functional/config.base.js`, { env: { ...process.env, NODE_TLS_REJECT_UNAUTHORIZED }, stdio: 'inherit' } ); }; diff --git a/x-pack/solutions/observability/plugins/observability/dev_docs/feature_flags.md b/x-pack/solutions/observability/plugins/observability/dev_docs/feature_flags.md index 3b06f83096dfe..0e55af5ba2549 100644 --- a/x-pack/solutions/observability/plugins/observability/dev_docs/feature_flags.md +++ b/x-pack/solutions/observability/plugins/observability/dev_docs/feature_flags.md @@ -11,6 +11,6 @@ if (core.uiSettings.get(myFeatureEnabled)) { } ``` -In order for telemetry to be collected, the keys and types need to be added in [src/plugins/kibana_usage_collection/server/collectors/management/schema.ts](../../../../../src/plugins/kibana_usage_collection/server/collectors/management/schema.ts) and [src/plugins/kibana_usage_collection/server/collectors/management/types.ts](../../../../src/plugins/kibana_usage_collection/server/collectors/management/types.ts). +In order for telemetry to be collected, the keys and types need to be added in [src/plugins/kibana_usage_collection/server/collectors/management/schema.ts](../../../../../../src/plugins/kibana_usage_collection/server/collectors/management/schema.ts) and [src/plugins/kibana_usage_collection/server/collectors/management/types.ts](../../../../../../src/plugins/kibana_usage_collection/server/collectors/management/types.ts). Settings can be managed in Kibana under Stack Management > Advanced Settings > Observability. diff --git a/x-pack/solutions/observability/plugins/synthetics/e2e/tasks/es_archiver.ts b/x-pack/solutions/observability/plugins/synthetics/e2e/tasks/es_archiver.ts index da8c349c4c70a..b9b4886f6af1e 100644 --- a/x-pack/solutions/observability/plugins/synthetics/e2e/tasks/es_archiver.ts +++ b/x-pack/solutions/observability/plugins/synthetics/e2e/tasks/es_archiver.ts @@ -16,7 +16,7 @@ const NODE_TLS_REJECT_UNAUTHORIZED = '1'; export const esArchiverLoad = (folder: string) => { const path = Path.join(ES_ARCHIVE_DIR, folder); execSync( - `node ../../../../../scripts/es_archiver load "${path}" --config ../../../test/functional/config.base.js`, + `node ../../../../../../../scripts/es_archiver load "${path}" --config ../../../../../../test/functional/config.base.js`, { env: { ...process.env, NODE_TLS_REJECT_UNAUTHORIZED }, stdio: 'inherit' } ); }; @@ -24,14 +24,14 @@ export const esArchiverLoad = (folder: string) => { export const esArchiverUnload = (folder: string) => { const path = Path.join(ES_ARCHIVE_DIR, folder); execSync( - `node ../../../../../scripts/es_archiver unload "${path}" --config ../../../test/functional/config.base.js`, + `node ../../../../../../../scripts/es_archiver unload "${path}" --config ../../../../../../test/functional/config.base.js`, { env: { ...process.env, NODE_TLS_REJECT_UNAUTHORIZED }, stdio: 'inherit' } ); }; export const esArchiverResetKibana = () => { execSync( - `node ../../../../../scripts/es_archiver empty-kibana-index --config ../../../test/functional/config.base.js`, + `node ../../../../../../../scripts/es_archiver empty-kibana-index --config ../../../../../../test/functional/config.base.js`, { env: { ...process.env, NODE_TLS_REJECT_UNAUTHORIZED }, stdio: 'inherit' } ); }; diff --git a/x-pack/solutions/observability/plugins/uptime/e2e/tasks/es_archiver.ts b/x-pack/solutions/observability/plugins/uptime/e2e/tasks/es_archiver.ts index e90dde307b0a8..b9b4886f6af1e 100644 --- a/x-pack/solutions/observability/plugins/uptime/e2e/tasks/es_archiver.ts +++ b/x-pack/solutions/observability/plugins/uptime/e2e/tasks/es_archiver.ts @@ -16,7 +16,7 @@ const NODE_TLS_REJECT_UNAUTHORIZED = '1'; export const esArchiverLoad = (folder: string) => { const path = Path.join(ES_ARCHIVE_DIR, folder); execSync( - `node ../../../../../../scripts/es_archiver load "${path}" --config ../../../../test/functional/config.base.js`, + `node ../../../../../../../scripts/es_archiver load "${path}" --config ../../../../../../test/functional/config.base.js`, { env: { ...process.env, NODE_TLS_REJECT_UNAUTHORIZED }, stdio: 'inherit' } ); }; @@ -24,14 +24,14 @@ export const esArchiverLoad = (folder: string) => { export const esArchiverUnload = (folder: string) => { const path = Path.join(ES_ARCHIVE_DIR, folder); execSync( - `node ../../../../../../scripts/es_archiver unload "${path}" --config ../../../../test/functional/config.base.js`, + `node ../../../../../../../scripts/es_archiver unload "${path}" --config ../../../../../../test/functional/config.base.js`, { env: { ...process.env, NODE_TLS_REJECT_UNAUTHORIZED }, stdio: 'inherit' } ); }; export const esArchiverResetKibana = () => { execSync( - `node ../../../../../../scripts/es_archiver empty-kibana-index --config ../../../../test/functional/config.base.js`, + `node ../../../../../../../scripts/es_archiver empty-kibana-index --config ../../../../../../test/functional/config.base.js`, { env: { ...process.env, NODE_TLS_REJECT_UNAUTHORIZED }, stdio: 'inherit' } ); };