maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow kibana_settings collector to return nothing (#22091)

Browse source 
* Fix kibana_settings collector to return nothing when no settings data is found

* make code more clear
This commit is contained in:
Tim Sullivan 2018-08-17 11:41:02 -07:00 committed by GitHub
parent 191ea1ffd8
commit 108d59cb91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js
View file

@ -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
@ -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) {
settingsDoc = {
kibana: getKibanaInfoForStats(server, kbnServer),
...kibanaSettingsData
};
}
return settingsDoc;
}
});
}