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

Mirror ES status; set own status to red if user settings are not found #7454

Merged
merged 9 commits into from
Jun 15, 2016
Merged

Mirror ES status; set own status to red if user settings are not found #7454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9c302e2
Toggle Kibana plugin red/green depending on whether user settings are…
ycombinator Jun 14, 2016
a81d759
Toggle Kibana to yellow instead of red
ycombinator Jun 14, 2016
777ebbc
Setting Elasticsearch plugin to yellow instead of Kibana plugin
ycombinator Jun 14, 2016
273c349
Merge branch 'master' into gh-7424
ycombinator Jun 15, 2016
ced2a21
[ui/settings] go red when settings are not found, otherwise mimic es …
Jun 15, 2016
5fe4a6b
Merge pull request #2 from spalger/pr/7454
ycombinator Jun 15, 2016
7b61123
Ignore the extra log line about the settings status
ycombinator Jun 15, 2016
658d5f5
Improving comment
ycombinator Jun 15, 2016
6222729
Extracting conditional message into its own constant for better reada…
ycombinator Jun 15, 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
2 changes: 1 addition & 1 deletion src/cli/serve/__tests__/reload_logging_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ ${err.stack || err.message || err}`).to.eql(true);
}

function switchToPlainTextLog() {
json = 2; // ignore both "reloading" messages
json = 3; // ignore both "reloading" messages + ui settings status message
setLoggingJson(false);
child.kill(`SIGHUP`); // reload logging config
}
Expand Down
21 changes: 16 additions & 5 deletions src/ui/settings/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { defaultsDeep, partial } from 'lodash';
import defaultsProvider from './defaults';

export default function setupSettings(kbnServer, server, config) {
const status = kbnServer.status.create('ui settings');
const uiSettings = {
getAll,
getDefaults,
Expand All @@ -12,6 +13,7 @@ export default function setupSettings(kbnServer, server, config) {
};

server.decorate('server', 'uiSettings', () => uiSettings);
kbnServer.ready().then(mirrorEsStatus);

function getAll() {
return Promise
Expand All @@ -24,11 +26,7 @@ export default function setupSettings(kbnServer, server, config) {
}

function userSettingsNotFound(kibanaVersion) {
if (server.plugins.elasticsearch.status.state === 'green') {
server.plugins.kibana.status.red(`Could not find user-provided settings for this version of Kibana (${kibanaVersion})`);
} else {
server.log(['warning', 'settings'], 'User-provided settings were requested before the Kibana index was ready');
}
status.red(`Could not find user-provided settings for Kibana ${kibanaVersion}`);
return {};
}

Expand Down Expand Up @@ -60,6 +58,19 @@ export default function setupSettings(kbnServer, server, config) {
function remove(key) {
return set(key, null);
}

function mirrorEsStatus() {
const esStatus = kbnServer.status.getForPluginId('elasticsearch');

copyStatus();
esStatus.on('change', copyStatus);

function copyStatus() {
const { state } = esStatus;
const statusMessage = state === 'green' ? 'Ready' : `Elasticsearch plugin is ${state}`;
status[state](statusMessage);
}
}
}

function hydrateUserSettings(user) {
Expand Down