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

[Elastic-Agent] ECS compliant Elastic agent metadata sent to fleet #18006

Merged
merged 4 commits into from
Apr 30, 2020
Merged

[Elastic-Agent] ECS compliant Elastic agent metadata sent to fleet #18006

merged 4 commits into from
Apr 30, 2020

Conversation

michalpristas
Copy link
Contributor

@michalpristas michalpristas commented Apr 27, 2020 •
edited
Loading

What does this PR do?

Fixes sending of metadata to fleet where instead of generated map we send an ECS compliant object.

Tested with elastic/kibana#64452

Why is it important?

To be fully ECS compliant

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

@michalpristas michalpristas added bug needs_backport PR is waiting to be backported to other branches. Project:fleet Ingest Management:alpha1 Group issues for ingest management alpha1 labels Apr 27, 2020
@michalpristas michalpristas self-assigned this Apr 27, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/ingest-management (Project:fleet)

@michalpristas michalpristas changed the title use meta object [Elastic-Agent] ECS compliant Elastic agent metadata sent to fleet Apr 27, 2020
@michalpristas michalpristas mentioned this pull request Apr 27, 2020
Merged
ruflin
ruflin reviewed Apr 27, 2020
View reviewed changes
x-pack/elastic-agent/pkg/agent/application/info/agent_metadata.go Outdated
@@ -15,6 +15,57 @@ import (
"github.com/elastic/go-sysinfo/types"
)

// ECSMeta is a collection of agent related metadata in ECS compliant object form.
type ECSMeta struct {
Agent *AgentECSMeta `json:"agent"`
Copy link
Contributor

Choose a reason for hiding this comment

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

@ph Same question as on the Kibana issue: I remember we said we prefix this agent meta data by elastic. as there might be other agent metadata which correlates better with the ECS defition.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah you are correct, forgot about that "elastic" specifif.

@ruflin Concerning that "elastic" I think we should make it a reserved key in the ECS specs?
Maybe @webmat has an opninion on that?

Copy link
Contributor

Choose a reason for hiding this comment

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

The guidance is that no brand name (or proper names in general) should get into the schema. ECS should only contain concepts to which multiple technologies can map.

So there's no need to "reserve" the prefix elastic., IMO.

Copy link
Contributor

Choose a reason for hiding this comment

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

Okay, my concern was teams using namespaces and possible clash because in the "elastic" namespace. But I do understand the no "brand name" but I wonder if is something we should have internally or a process.

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview stats

Expand to view the summary

Build stats

@michalpristas michalpristas merged commit cce1809 into elastic:master Apr 30, 2020
michalpristas added a commit to michalpristas/beats that referenced this pull request May 4, 2020
@michalpristas
[Elastic-Agent] ECS compliant Elastic agent metadata sent to fleet (e…
26ea41d 
…lastic#18006)

* use meta object

* changelog

* agent.* => elastic.agent.*
michalpristas added a commit that referenced this pull request May 4, 2020
@michalpristas
Cherry-pick #17894 to 7.x: Agent push ECS meta to fleet (#17921)
a1ee6fd 
* [Elastic-Agent] Agent push ECS meta to fleet (#17894)

[Elastic-Agent] Agent push ECS meta to fleet (#17894)

* [Elastic-Agent] ECS compliant Elastic agent metadata sent to fleet  (#18006)

* use meta object

* changelog

* agent.* => elastic.agent.*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruflin ruflin ruflin left review comments

@webmat webmat webmat left review comments

@ph ph ph approved these changes

Assignees

@michalpristas michalpristas

Labels
bug Ingest Management:alpha1 Group issues for ingest management alpha1 needs_backport PR is waiting to be backported to other branches.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@michalpristas @elasticmachine @ph @webmat @ruflin