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

[types removal] Remove type from bulk_uploader in monitoring #32315

Merged
merged 3 commits into from
Mar 5, 2019
Merged

[types removal] Remove type from bulk_uploader in monitoring #32315

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a1d444
[types removal] Remove type from bulk_uploader in monitoring
sulemanof Mar 1, 2019
35ac7a7
Remove type from get_settings_collector
sulemanof Mar 4, 2019
1f889c0
Revert changes
sulemanof Mar 5, 2019
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
6 changes: 2 additions & 4 deletions x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,7 @@ export class BulkUploader {
* After:
* [
* {
* "index": {
* "_type": "kibana_stats"
* }
* "index": {}
* },
* {
* "kibana": {
Expand Down Expand Up @@ -181,7 +179,7 @@ export class BulkUploader {
const flat = Object.keys(typesNested).reduce((accum, type) => {
return [
...accum,
{ index: { _type: type } },
{ index: {} },
Copy link
Contributor

Choose a reason for hiding this comment

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

This will actually break internal collection. It's a bit confusing because the endpoint we use to index monitoring documents is a different endpoint than the typical bulk endpoint. This _type is actually rewritten in this custom ES endpoint to not be the type of the document, but rather a type field nested in the source of the indexed document. We need to remove this change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@chrisronline in that case what is a way to avoid a deprecation warning?

Copy link
Contributor

Choose a reason for hiding this comment

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

@chrisronline @sulemanof
I've created issue to track that: #32458.

{
kibana: this._getKibanaInfoForStats(),
...typesNested[type],
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -36,7 +36,6 @@ export async function getDefaultAdminEmail(config, callCluster, log) {
const version = config.get('pkg.version');
const uiSettingsDoc = await callCluster('get', {
index,
type: 'doc',
Copy link
Contributor

Choose a reason for hiding this comment

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

This change looks good!

id: `config:${version}`,
ignore: [400, 404] // 400 if the index is closed, 404 if it does not exist
});
Expand Down