Skip to content

[7.x](backport #26394) [Elastic Agent] Use Fleet agent ID as agent.id#26416

Merged
andrewkroh merged 1 commit into7.xfrom
mergify/bp/7.x/pr-26394
Jun 22, 2021
Merged

[7.x](backport #26394) [Elastic Agent] Use Fleet agent ID as agent.id#26416
andrewkroh merged 1 commit into7.xfrom
mergify/bp/7.x/pr-26394

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 22, 2021

This is an automatic backport of pull request #26394 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

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)
@mergify mergify bot added the backport label Jun 22, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 22, 2021
@botelastic
Copy link
Copy Markdown

botelastic bot commented Jun 22, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #26416 opened

  • Start Time: 2021-06-22T16:40:51.344+0000

  • Duration: 93 min 54 sec

  • Commit: 43e9474

Test stats 🧪

Test Results
Failed 0
Passed 6876
Skipped 24
Total 6900

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 6876
Skipped 24
Total 6900

@andrewkroh andrewkroh merged commit 4e45811 into 7.x Jun 22, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-26394 branch June 22, 2021 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants