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

Jump to bottom

Allow kibana_settings collector to return nothing #22091

Merged
merged 3 commits into from
Aug 17, 2018
Merged

Allow kibana_settings collector to return nothing #22091

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ce0bc4
Fix kibana_settings collector to return nothing when no settings data…
tsullivan Aug 16, 2018
b476642
make code more clear
tsullivan Aug 16, 2018
c31a653
Merge branch 'master' into fix/kibana-settings-uploader-for-null
tsullivan Aug 16, 2018
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
16 changes: 11 additions & 5 deletions x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export function getSettingsCollector(server, kbnServer) {
return collectorSet.makeStatsCollector({
type: KIBANA_SETTINGS_TYPE,
async fetch(callCluster) {
let kibanaSettingsData;
let kibanaSettingsData = null;
const defaultAdminEmail = await checkForEmailValue(config, callCluster);

// skip everything if defaultAdminEmail === undefined
Expand All @@ -79,10 +79,16 @@ export function getSettingsCollector(server, kbnServer) {
// remember the current email so that we can mark it as successful if the bulk does not error out
shouldUseNull = !!defaultAdminEmail;

return {
kibana: getKibanaInfoForStats(server, kbnServer),
...kibanaSettingsData
};
// return nothing when there was no result
let settingsDoc;
if (kibanaSettingsData != null) { // test null or undefined
Copy link
Member

Choose a reason for hiding this comment

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

This won't catch undefined, but reading through the code it doesn't have to do that.

Copy link
Contributor

Choose a reason for hiding this comment

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

++ I'd just update the comment to not say or undefined.

Copy link
Member Author

@tsullivan tsullivan Aug 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Using double-equals to check for null or undefined is a habit I've acquired from working in Canvas:

> var foo
> foo == null ? "hi" : "bye"
"hi"

But you are right, the code doesn't have to do that. The comment is accurate though.

Copy link
Member

Choose a reason for hiding this comment

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

Oh that's interesting and subtle. Not a fan :), but I suppose it works.

Copy link
Member Author

Choose a reason for hiding this comment

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

pushed b476642 to remove any unclarity

settingsDoc = {
kibana: getKibanaInfoForStats(server, kbnServer),
...kibanaSettingsData
};
}

return settingsDoc;
}
});
}