diff --git a/src/ui/settings/index.js b/src/ui/settings/index.js index 3049a31f8784e..7ee9ef504e1a6 100644 --- a/src/ui/settings/index.js +++ b/src/ui/settings/index.js @@ -24,26 +24,16 @@ export default function setupSettings(kbnServer, server, config) { } function userSettingsNotFound(kibanaVersion) { - server.plugins.kibana.status.yellow(`Could not find user-provided settings for this version of Kibana (${kibanaVersion})`); + server.plugins.elasticsearch.status.yellow(`Could not find user-provided settings for this version of Kibana (${kibanaVersion})`); return {}; } - function resetKibanaPluginStatusIfNecessary(user) { - const isElasticsearchPluginGreen = server.plugins.elasticsearch.status.state === 'green'; - const isKibanaPluginCurrentlyYellow = server.plugins.kibana.status.state === 'yellow'; - if (isElasticsearchPluginGreen && isKibanaPluginCurrentlyYellow) { - server.plugins.kibana.status.green('Ready'); - } - return user; - } - function getUserProvided() { const { client } = server.plugins.elasticsearch; const clientSettings = getClientSettings(config); return client .get({ ...clientSettings }) .then(res => res._source) - .then(resetKibanaPluginStatusIfNecessary) .catch(partial(userSettingsNotFound, clientSettings.id)) .then(user => hydrateUserSettings(user)); }