[Elastic Agent] Use Fleet agent ID as agent.id#26394
Merged
andrewkroh merged 1 commit intoelastic:masterfrom Jun 22, 2021
Merged
[Elastic Agent] Use Fleet agent ID as agent.id#26394andrewkroh merged 1 commit intoelastic:masterfrom
andrewkroh merged 1 commit intoelastic:masterfrom
Conversation
Contributor
|
Pinging @elastic/agent (Team:Agent) |
82bd481 to
d6a4976
Compare
Contributor
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪💚 Flaky test reportTests succeeded. Expand to view the summary
Test stats 🧪
|
This updates the inject_agent_info rule to set the `agent.id` field to the value of the Fleet Agent ID. Previously this value was only added to the `elastic_agent.id` field, and the `agent.id` field was a random UUID generated the first time a Beat process was run. And each Beat process would have its own UUID. This change affects metricbeat, filebeat, heartbeat, osquerybeat, and packetbeat (these are the Beats that have an integration with Agent today). Heartbeat's Agent spec was missing the `inject_agent_info` so I added it. Closes elastic#21121
d6a4976 to
313cd53
Compare
Contributor
|
@michalpristas Can you take a look at this PR, I think the strategy but I think you have a better understanding of the impact of changes in the area of the code. |
michalpristas
approved these changes
Jun 22, 2021
Contributor
michalpristas
left a comment
There was a problem hiding this comment.
the change is backward compatible and preserves elastic_agent.id|version|snapshot
having same ID should be ok as the way of collecting event is an implementation detail.
mergify bot
pushed a commit
that referenced
this pull request
Jun 22, 2021
This updates the inject_agent_info rule to set the `agent.id` field to the value of the Fleet Agent ID. Previously this value was only added to the `elastic_agent.id` field, and the `agent.id` field was a random UUID generated the first time a Beat process was run. And each Beat process would have its own UUID. This change affects metricbeat, filebeat, heartbeat, osquerybeat, and packetbeat (these are the Beats that have an integration with Agent today). Heartbeat's Agent spec was missing the `inject_agent_info` so I added it. Closes #21121 (cherry picked from commit bb950bf)
andrewkroh
added a commit
that referenced
this pull request
Jun 22, 2021
This updates the inject_agent_info rule to set the `agent.id` field to the value of the Fleet Agent ID. Previously this value was only added to the `elastic_agent.id` field, and the `agent.id` field was a random UUID generated the first time a Beat process was run. And each Beat process would have its own UUID. This change affects metricbeat, filebeat, heartbeat, osquerybeat, and packetbeat (these are the Beats that have an integration with Agent today). Heartbeat's Agent spec was missing the `inject_agent_info` so I added it. Closes #21121 (cherry picked from commit bb950bf) Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
2 tasks
andrewkroh
added a commit
to andrewkroh/beats
that referenced
this pull request
Jun 28, 2021
This is a follow up to elastic#26394 which set the agent.id field to the Fleet agent ID for for integrations that are run by Agent, but that didn't cover the Filebeat and Metricbeat processes that are executed by Agent for monitoring itself. This covers those processes. Relates elastic#26394
mergify bot
pushed a commit
that referenced
this pull request
Jun 29, 2021
This is a follow up to #26394 which set the agent.id field to the Fleet agent ID for for integrations that are run by Agent, but that didn't cover the Filebeat and Metricbeat processes that are executed by Agent for monitoring itself. This covers those processes. Relates #26394 (cherry picked from commit 7b66597)
andrewkroh
added a commit
that referenced
this pull request
Jun 29, 2021
…26591) * Add Fleet agent.id to Agent monitoring data (#26548) This is a follow up to #26394 which set the agent.id field to the Fleet agent ID for for integrations that are run by Agent, but that didn't cover the Filebeat and Metricbeat processes that are executed by Agent for monitoring itself. This covers those processes. Relates #26394 (cherry picked from commit 7b66597) * Fix changelog merge Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
mergify bot
pushed a commit
that referenced
this pull request
Jul 7, 2021
This is a follow up to #26394 which set the agent.id field to the Fleet agent ID for for integrations that are run by Agent, but that didn't cover the Filebeat and Metricbeat processes that are executed by Agent for monitoring itself. This covers those processes. Relates #26394 (cherry picked from commit 7b66597)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This updates the inject_agent_info rule to set the
agent.idfield to the value of the Fleet Agent ID.Previously this value was only added to the
elastic_agent.idfield, and theagent.idfield wasa random UUID generated the first time a Beat process was run. And each Beat process would
have its own UUID.
This change affects metricbeat, filebeat, heartbeat, osquerybeat, and packetbeat (these are the
Beats that have an integration with Agent today). Heartbeat's Agent spec was missing the
inject_agent_infoso I added it.Closes #21121
Why is it important?
The
agent.idof the running processes to match what we show to users in the Fleet UI.Checklist
- [ ] I have made corresponding changes to the documentation- [ ] I have made corresponding change to the default configuration filesCHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.Related issues