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

Don't turn Kibana plugin red if Kibana index is not yet ready #7428

Merged
merged 8 commits into from
Jun 10, 2016
Merged

Don't turn Kibana plugin red if Kibana index is not yet ready #7428

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a2459bb
If Elasticsearch plugin is not yet green, log a warning
ycombinator Jun 10, 2016
ab66d5e
Reload window if user has been sent to status page but status is green
ycombinator Jun 10, 2016
e860fc3
Adding comments
ycombinator Jun 10, 2016
3ebf365
Removing extra parenthesis because operator precedence is a thing
ycombinator Jun 10, 2016
aa05237
Removing redundant comments
ycombinator Jun 10, 2016
db780bd
Removing window reload code in favor of the right fix for what is a l…
ycombinator Jun 10, 2016
58f9843
Removing unused variable
ycombinator Jun 10, 2016
3425818
Using template string instead of concatenation
ycombinator Jun 10, 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
8 changes: 6 additions & 2 deletions src/ui/settings/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@ export default function setupSettings(kbnServer, server, config) {
}

function userSettingsNotFound(kibanaVersion) {
const message = 'Could not find user-provided settings for this version of Kibana (' + kibanaVersion + ')';
server.plugins.kibana.status.red(message);
let message;
if (server.plugins.elasticsearch.status.state === 'green') {
server.plugins.kibana.status.red('Could not find user-provided settings for this version of Kibana (' + kibanaVersion + ')');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we change the message into a template string? Also the message variable is unused.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally. And good catch on the unused message variable — I'm surprised the linter didn't catch that. Fixing both things.

} else {
server.log(['warning', 'settings'], 'User-provided settings were requested before the Kibana index was ready');
}
return {};
}

Expand Down