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

[Ingest Manager] Replace datasources with inputs when generating agent config #69226

Merged
merged 6 commits into from
Jun 17, 2020
Merged

[Ingest Manager] Replace datasources with inputs when generating agent config #69226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e67d5e7
Adjust agent config generation, change `datasources` to `inputs`
jen-huang Jun 16, 2020
fbcf50c
Add dataset.type
jen-huang Jun 16, 2020
e1bbbb5
Remove dead code
jen-huang Jun 16, 2020
e70c6d8
Revert "Add dataset.type"
jen-huang Jun 16, 2020
c54005a
Update endpoint policy test assertion
jen-huang Jun 16, 2020
35085f0
Merge remote-tracking branch 'upstream/master' into ingest/flatten-ag…
jen-huang Jun 16, 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
5 changes: 3 additions & 2 deletions x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ const CONFIG_KEYS_ORDER = [
'name',
'revision',
'type',
'outputs',
'settings',
'datasources',
'outputs',
'inputs',
'enabled',
'use_output',
'package',
Copy link
Member

Choose a reason for hiding this comment

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

I propose to move this under meta. All things that the agent does not directly understand but potentially should be used for logging, should go into a meta object. I assume currently this has no effect on the agent side? @michalpristas ?

Copy link

Choose a reason for hiding this comment

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

agent uses this to group inputs together and provide per output configurations as current implementation is one beat per output, we rely heavily on this field. if it's not present in the tree (input upwards) we assume default output

Copy link
Member

Choose a reason for hiding this comment

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

@michalpristas I think you talk about line 18 here with the output? I'm referring to line 19.

Copy link

Choose a reason for hiding this comment

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

oh ok, i think we dont use package

'input',
];
Expand Down
190 changes: 0 additions & 190 deletions x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.test.ts
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.ts
View file
Open in desktop

This file was deleted.

Loading