Skip to content

[plugin installer] check multiple default paths for config #7440

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

Merged
jbudz merged 2 commits into from
Jun 15, 2016
Merged

[plugin installer] check multiple default paths for config #7440

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9be15fb
[plugin installer] check multiple default paths for config
jbudz Jun 13, 2016
3ce2c5f
[plugin installer] Use find instead of some when looking for path
jbudz Jun 14, 2016
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
22 changes: 21 additions & 1 deletion src/cli_plugin/install/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { fromRoot } from '../../utils';
import fs from 'fs';
import install from './install';
import Logger from '../lib/logger';
import pkg from '../../utils/package_json';
import { parse, parseMilliseconds } from './settings';
import { find } from 'lodash';

function processCommand(command, options) {
let settings;
Expand All @@ -18,6 +20,24 @@ function processCommand(command, options) {
install(settings, logger);
}

function getDefaultConfigPath() {
const paths = [
fromRoot('config/kibana.yml'),
'/etc/kibana/kibana.yml'
];

const availablePath = find(paths, configPath => {
try {
fs.accessSync(configPath, fs.R_OK);
return true;
} catch (e) {
//Check the next path
}
});

return availablePath || paths[0];
}

export default function pluginInstall(program) {
program
.command('install <plugin/url>')
Expand All @@ -26,7 +46,7 @@ export default function pluginInstall(program) {
.option(
'-c, --config <path>',
'path to the config file',
fromRoot('config/kibana.yml')
getDefaultConfigPath()
)
.option(
'-t, --timeout <duration>',
Expand Down