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.

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

[Ingest] Allow agent to send metadata compliant with ECS #64452

Merged
merged 3 commits into from
Apr 30, 2020

Conversation

nchaulet
Copy link
Member

@nchaulet nchaulet commented Apr 24, 2020

Summary

Resolves #64173

Allow agent metadata to be compliant with ECS
example of metadata the agent is sending

{
 "os" : { "platform": "windows" },
 "elastic": { "agent": {"version": "8.0.0"} },
 "host": {"hostname": "foobar"}
}

This PR allow agent to send nested metadata instead of {[k: string]: string} metadata

@nchaulet nchaulet added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes v7.8.0 Team:Fleet Team label for Observability Data Collection Fleet team Ingest Management:alpha1 Group issues for ingest management alpha1 labels Apr 24, 2020
@nchaulet nchaulet self-assigned this Apr 24, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/ingest-management (Team:Ingest Management)

@nchaulet
Copy link
Member Author

cc @michalpristas

@nchaulet nchaulet force-pushed the feature-fleet-metadata-ecs branch from aeb7247 to 6f2d150 Compare April 24, 2020 18:39
@nchaulet nchaulet marked this pull request as ready for review April 24, 2020 20:28
@nchaulet nchaulet requested review from a team and michalpristas April 24, 2020 20:28
@ruflin
Copy link
Contributor

ruflin commented Apr 27, 2020

@ph Should the above be elastic.agent.version?

@michalpristas
Copy link

agent related work here: elastic/beats#18006

@ph
Copy link
Contributor

ph commented Apr 27, 2020

@ruflin Correct, thanks @michalpristas for making the change on our side.

@nchaulet nchaulet requested a review from jen-huang April 28, 2020 19:25
Copy link
Contributor

@jen-huang jen-huang left a comment

Choose a reason for hiding this comment

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

Code LGTM, didn't test locally

@nchaulet
Copy link
Member Author

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@nchaulet nchaulet merged commit d75328c into elastic:master Apr 30, 2020
@nchaulet
Copy link
Member Author

@michalpristas it's merged :)

@nchaulet nchaulet deleted the feature-fleet-metadata-ecs branch April 30, 2020 14:34
nchaulet added a commit to nchaulet/kibana that referenced this pull request Apr 30, 2020
gmmorris added a commit to gmmorris/kibana that referenced this pull request Apr 30, 2020
* master: (42 commits)
  [Ingest] Allow aggent to send metadata compliant with ECS (elastic#64452)
  [Endpoint] Remove todos, urls to issues (elastic#64833)
  [Uptime] Remove hard coded value for monitor states histograms (elastic#64396)
  Feature/send feedback link (elastic#64845)
  [ML] Moving get filters capability to admin (elastic#64879)
  Remove edit alert button from alerts list (elastic#64643)
  [EPM] Handle constant_keyword type in KB index patterns and ES index templates (elastic#64876)
  [ML] Disable data frame anaylics clone button based on permission (elastic#64830)
  Dashboard url generator to preserve saved filters from destination dashboard (elastic#64767)
  add generic typings for SavedObjectMigrationFn (elastic#63943)
  Allow to define and update a defaultPath for applications (elastic#64498)
  [Event Log] add rel=primary to saved objects for query targets (elastic#64615)
  [Lens] Use a size of 5 for first string field in visualization (elastic#64726)
  [SIEM][Lists] Removes plugin dependencies, adds more unit tests, fixes more TypeScript types
  [Ingest] Edit datasource UI (elastic#64727)
  [Lens] Bind all time fields to the time picker (elastic#63874)
  [Lens] Use suggestion system in chart switcher for subtypes (elastic#64613)
  Improve alpha messaging (elastic#64692)
  [Ingest] Allow to enable monitoring of elastic agent (elastic#63598)
  [Metrics UI] Fix alerting when a filter query is present (elastic#64575)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ingest Management:alpha1 Group issues for ingest management alpha1 release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.8.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Ingest Management] Use ECS metadata from elastic agent
7 participants