Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[APM] Correct relative paths in scripts #66159

Merged
merged 3 commits into from
May 12, 2020
Merged

[APM] Correct relative paths in scripts #66159

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b97a1b5
[APM] Correct relative paths in scripts
dgieselaar May 12, 2020
51ca685
Merge branch 'master' into update-paths-for-scripts
elasticmachine May 12, 2020
d6db09e
Remove console.log statement
dgieselaar May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion x-pack/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leftover?

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;
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down