github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7454 from ycombinator/gh-7424

Browse source 
Mirror ES status; set own status to red if user settings are not found
This commit is contained in:
Shaunak Kashyap 2016-06-15 11:28:08 -05:00 • committed by GitHub
commit 97144848a9
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cli/serve/__tests__/reload_logging_config.js
View file

@ -68,7 +68,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
}

21
src/ui/settings/index.js
View file

@ -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,
@ -12,6 +13,7 @@ export default function setupSettings(kbnServer, server, config) {
};
server.decorate('server', 'uiSettings', () => uiSettings);
kbnServer.ready().then(mirrorEsStatus);
function getAll() {
return Promise
@ -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 {};
}
@ -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) {