Skip to content

Commit

Permalink
settings: do not query ES for settings in non-green status (elastic#9311
Browse files Browse the repository at this point in the history
)

Backports PR elastic#9308

**Commit 1:**
settings: do not query ES for settings in non-green status

If the ui settings status is not green, that means there is at least one
dependency (so elasticsearch at the moment) that is not met in order for
it to function correctly, so we shouldn't attempt to determine user
settings at all.

This ensures that when something like the version check fails in the
elasticsearch plugin, Kibana correctly behaves by not attempting
requests to elasticsearch, which prevents 500 errors and allows users to
see the error status on the status page.

We also now periodically check for compatible elasticsearch versions so
that Kibana can automatically recover if the elasticsearch node is
upgraded to the appropriate version.

* Original sha: 43742b2
* Authored by Court Ewing <[email protected]> on 2016-12-01T17:02:19Z
Former-commit-id: 68c3387
elastic-jasper authored and epixa committed Dec 1, 2016
1 parent e8f48eb commit 5c68a85
Showing 3 changed files with 26 additions and 3 deletions.
9 changes: 8 additions & 1 deletion src/core_plugins/elasticsearch/lib/health_check.js
Original file line number Diff line number Diff line change
@@ -81,13 +81,20 @@ module.exports = function (plugin, server) {
});
}

function waitForEsVersion() {
return checkEsVersion(server, kibanaVersion.get()).catch(err => {
plugin.status.red(err);
return Promise.delay(REQUEST_DELAY).then(waitForEsVersion);
});
}

function setGreenStatus() {
return plugin.status.green('Kibana index ready');
}

function check() {
return waitForPong()
.then(() => checkEsVersion(server, kibanaVersion.get()))
.then(waitForEsVersion)
.then(waitForShards)
.then(setGreenStatus)
.then(_.partial(migrateConfig, server))
13 changes: 11 additions & 2 deletions src/ui/settings/__tests__/index.js
Original file line number Diff line number Diff line change
@@ -158,6 +158,14 @@ describe('ui settings', function () {
})).to.equal(true);
});

it('returns an empty object when status is not green', async function () {
const { uiSettings, req } = instantiate({
settingsStatusOverrides: { state: 'yellow' }
});

expect(await uiSettings.getUserProvided(req)).to.eql({});
});

it('returns an empty object on 404 responses', async function () {
const { uiSettings, req } = instantiate({
async callWithRequest() {
@@ -361,7 +369,7 @@ function expectElasticsearchUpdateQuery(server, req, configGet, doc) {
});
}

function instantiate({ getResult, callWithRequest } = {}) {
function instantiate({ getResult, callWithRequest, settingsStatusOverrides } = {}) {
const esStatus = {
state: 'green',
on: sinon.spy()
@@ -370,7 +378,8 @@ function instantiate({ getResult, callWithRequest } = {}) {
state: 'green',
red: sinon.spy(),
yellow: sinon.spy(),
green: sinon.spy()
green: sinon.spy(),
...settingsStatusOverrides
};
const kbnServer = {
status: {
7 changes: 7 additions & 0 deletions src/ui/settings/index.js
Original file line number Diff line number Diff line change
@@ -68,6 +68,13 @@ export default function setupSettings(kbnServer, server, config) {
assertRequest(req);
const { callWithRequest, errors } = server.plugins.elasticsearch;

// If the ui settings status isn't green, we shouldn't be attempting to get
// user settings, since we can't be sure that all the necessary conditions
// (e.g. elasticsearch being available) are met.
if (status.state !== 'green') {
return hydrateUserSettings({});
}

const params = getClientSettings(config);
const allowedErrors = [errors[404], errors[403], errors.NoConnections];
if (ignore401Errors) allowedErrors.push(errors[401]);

0 comments on commit 5c68a85

Please sign in to comment.