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

If user settings cannot be found for installed version of Kibana, turn Kibana plugin red #7333

Merged
merged 3 commits into from
Jun 2, 2016
Merged

If user settings cannot be found for installed version of Kibana, turn Kibana plugin red #7333

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4902271
If there is an error, return an empty object for user settings
ycombinator May 31, 2016
357e391
Turn Kibana plugin red if user settings cannot be found
ycombinator Jun 1, 2016
484e45f
Using _.partial() instead of bind()
ycombinator Jun 2, 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
9 changes: 8 additions & 1 deletion src/ui/settings/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defaultsDeep } from 'lodash';
import { defaultsDeep, partial } from 'lodash';
import defaultsProvider from './defaults';

export default function setupSettings(kbnServer, server, config) {
Expand All @@ -23,12 +23,19 @@ export default function setupSettings(kbnServer, server, config) {
return Promise.resolve(defaultsProvider());
}

function userSettingsNotFound(kibanaVersion) {
const message = 'Could not find user-provided settings for this version of Kibana (' + kibanaVersion + ')';
server.plugins.kibana.status.red(message);
return {};
}

function getUserProvided() {
const { client } = server.plugins.elasticsearch;
const clientSettings = getClientSettings(config);
return client
.get({ ...clientSettings })
.then(res => res._source)
.catch(partial(userSettingsNotFound, clientSettings.id))
.then(user => hydrateUserSettings(user));
}

Expand Down