From b97a1b59fbf9121dff83d09f4bebb7b50a3caacc Mon Sep 17 00:00:00 2001 From: Dario Gieselaar Date: Tue, 12 May 2020 10:28:41 +0200 Subject: [PATCH 1/2] [APM] Correct relative paths in scripts --- .../scripts/kibana-security/setup-custom-kibana-user-role.ts | 4 +++- x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts b/x-pack/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts index 85aa43f78f7dd6..40eaa7a7411c73 100644 --- a/x-pack/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts +++ b/x-pack/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts @@ -15,11 +15,13 @@ import { argv } from 'yargs'; const config = yaml.safeLoad( fs.readFileSync( - path.join(__filename, '../../../../../../../config/kibana.dev.yml'), + path.join(__filename, '../../../../../../config/kibana.dev.yml'), 'utf8' ) ); +console.log(config); + const KIBANA_INDEX = config['kibana.index'] as string; const TASK_MANAGER_INDEX = config['xpack.task_manager.index'] as string; const KIBANA_ROLE_SUFFIX = argv.roleSuffix as string; diff --git a/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts b/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts index 4f69a3a3bd2138..f80f9da7de3874 100644 --- a/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts +++ b/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts @@ -38,7 +38,7 @@ if (!githubToken) { throw new Error('GITHUB_TOKEN was not provided.'); } -const kibanaConfigDir = path.join(__filename, '../../../../../../../config'); +const kibanaConfigDir = path.join(__filename, '../../../../../../config'); const kibanaDevConfig = path.join(kibanaConfigDir, 'kibana.dev.yml'); const kibanaConfig = path.join(kibanaConfigDir, 'kibana.yml'); From d6db09e2da6ac7f582d10d8015e865c4bf5cc8d4 Mon Sep 17 00:00:00 2001 From: Dario Gieselaar Date: Tue, 12 May 2020 11:28:47 +0200 Subject: [PATCH 2/2] Remove console.log statement --- .../scripts/kibana-security/setup-custom-kibana-user-role.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/x-pack/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts b/x-pack/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts index 40eaa7a7411c73..19e22b3718a787 100644 --- a/x-pack/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts +++ b/x-pack/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts @@ -20,8 +20,6 @@ const config = yaml.safeLoad( ) ); -console.log(config); - const KIBANA_INDEX = config['kibana.index'] as string; const TASK_MANAGER_INDEX = config['xpack.task_manager.index'] as string; const KIBANA_ROLE_SUFFIX = argv.roleSuffix as string;