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

[Monitoring] Ensure monitoring bulk uploader and stats api are more closely aligned #73325

Merged
merged 3 commits into from
Jul 31, 2020
Merged

[Monitoring] Ensure monitoring bulk uploader and stats api are more closely aligned #73325

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a5cac5
Use defaultsDeep to match what monitoring is doing
chrisronline Jul 27, 2020
19327aa
Merge branch 'master' into stats_match_bulk_uploader
elasticmachine Jul 30, 2020
54701a6
Merge branch 'master' into stats_match_bulk_uploader
elasticmachine Jul 30, 2020
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: 4 additions & 4 deletions src/legacy/server/status/routes/api/register_stats.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import Joi from 'joi';
import boom from 'boom';
import { defaultsDeep } from 'lodash';
import { i18n } from '@kbn/i18n';
import { wrapAuthConfig } from '../../wrap_auth_config';
import { getKibanaInfoForStats } from '../../lib';
Expand Down Expand Up @@ -120,10 +121,9 @@ export function registerStatsApi(usageCollection, server, config, kbnServer) {
},
};
} else {
accum = {
...accum,
[usageKey]: usage[usageKey],
};
// I don't think we need to it this for the above conditions, but do it for most as it will
// match the behavior done in monitoring/bulk_uploader
defaultsDeep(accum, { [usageKey]: usage[usageKey] });
}

return accum;
Expand Down