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

Set agent.id to Fleet Agent ID for each metric/log monitoring input #26776

Merged
merged 1 commit into from
Jul 12, 2021
Merged

Set agent.id to Fleet Agent ID for each metric/log monitoring input #26776

merged 1 commit into from
Jul 12, 2021

Conversation

andrewkroh
Copy link
Member

@andrewkroh andrewkroh commented Jul 7, 2021 •
edited
Loading

What does this PR do?

An earlier commit #26548 set the same value using a single global processor,
but that doesn't seem to make it into the final config so it had no effect. So this
sets the agent.id at the same places where elastic_agent.id is added.

Why is it important?

It makes elastic_agent.id and agent.id contain the same Fleet Agent ID.

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.

Related issues

Screenshots

Screenshot showing that agent.id matches elastic_agent.id for monitoring indices.

Screen Shot 2021-07-07 at 7 53 53 PM

@andrewkroh
Set agent.id to Fleet Agent ID for each metric/log monitoring input
cc2093e 
An earlier commit elastic#26548 set the same value using a single global processor,
but that doesn't seem to make it into the final config so it had no effect. So this
sets the agent.id at the same places where elastic_agent.id is added.
@andrewkroh andrewkroh added bug review Agent Team:Elastic-Agent Label for the Agent team backport-v7.14.0 Automated backport with mergify backport-v7.15.0 Automated backport with mergify labels Jul 7, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jul 7, 2021
@andrewkroh andrewkroh mentioned this pull request Jul 7, 2021
Merged
2 tasks
@elasticmachine
Copy link
Collaborator

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-07-07T21:03:53.264+0000

  • Duration: 72 min 56 sec

  • Commit: cc2093e

Test stats 🧪

Test Results
Failed 0
Passed 6972
Skipped 16
Total 6988

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 6972
Skipped 16
Total 6988

@andrewkroh andrewkroh requested a review from a team July 9, 2021 14:53
michel-laterman
michel-laterman approved these changes Jul 12, 2021
View reviewed changes
Copy link
Contributor

@michel-laterman michel-laterman left a comment

Choose a reason for hiding this comment

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

lgtm

@andrewkroh andrewkroh merged commit aa62bba into elastic:master Jul 12, 2021
mergify bot pushed a commit that referenced this pull request Jul 12, 2021
@andrewkroh
Set agent.id to Fleet Agent ID for each metric/log monitoring input (#…
4749014 
…26776)

An earlier commit #26548 set the same value using a single global processor,
but that doesn't seem to make it into the final config so it had no effect. So this
sets the agent.id at the same places where elastic_agent.id is added.

(cherry picked from commit aa62bba)
@mergify mergify bot mentioned this pull request Jul 12, 2021
Merged
mergify bot pushed a commit that referenced this pull request Jul 12, 2021
@andrewkroh
Set agent.id to Fleet Agent ID for each metric/log monitoring input (#…
214ffef 
…26776)

An earlier commit #26548 set the same value using a single global processor,
but that doesn't seem to make it into the final config so it had no effect. So this
sets the agent.id at the same places where elastic_agent.id is added.

(cherry picked from commit aa62bba)
@mergify mergify bot mentioned this pull request Jul 12, 2021
Merged
andrewkroh added a commit that referenced this pull request Jul 12, 2021
@mergify @andrewkroh
Set agent.id to Fleet Agent ID for each metric/log monitoring input (#…
7424b88 
…26776) (#26849)

An earlier commit #26548 set the same value using a single global processor,
but that doesn't seem to make it into the final config so it had no effect. So this
sets the agent.id at the same places where elastic_agent.id is added.

(cherry picked from commit aa62bba)

Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
andrewkroh added a commit that referenced this pull request Jul 12, 2021
@mergify @andrewkroh
Set agent.id to Fleet Agent ID for each metric/log monitoring input (#…
4faeca5 
…26776) (#26850)

An earlier commit #26548 set the same value using a single global processor,
but that doesn't seem to make it into the final config so it had no effect. So this
sets the agent.id at the same places where elastic_agent.id is added.

(cherry picked from commit aa62bba)

Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
mdelapenya added a commit to mdelapenya/beats that referenced this pull request Jul 19, 2021
@mdelapenya
Merge branch 'master' into archive-system-tests
78d203f 
* master: (61 commits)
  Add disk queue unit tests based on the queuetest package
  [Heartbeat] redact authorization headers from logger (elastic#26892)
  Expose custom process metrics  (elastic#26912)
  [gcp/billing] always quote table name identifier (elastic#26870)
  Add Beats central management removal to BCs (elastic#26400)
  Add custom suffix to identifiers in filestream input when needed (elastic#26669)
  Update asa-ftd-pipeline.yml (elastic#26265)
  Use common host parser in vsphere module (elastic#26904)
  [automation] Update go release version 1.16.6 (elastic#26860)
  Skip flaky test: filestream and harvester group (elastic#26728)
  [Filebeat] Remove alias fields from Suricata and Traefik module mappings (elastic#26627)
  docs: apm-server.auth (elastic#26831)
  [Automation] Update elastic stack version to 8.0.0-2f008f4a for testing (elastic#26881)
  Clarify the scope of start/end multiline example (elastic#26786)
  [Heartbeat]: update Node.js version for synthetics (elastic#26867)
  [fix][httpjson] Fix incorrect key for template data (elastic#26848)
  [httpjson] Add value_type parameter to httpjson transforms (elastic#26847)
  [Heartbeat]: capture error from journey/end events (elastic#26781)
  [Winlogbeat] Fixes for wineventlog experimental api (elastic#26826)
  Set agent.id to Fleet Agent ID for each metric/log monitoring input (elastic#26776)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michel-laterman michel-laterman michel-laterman approved these changes

Assignees
No one assigned
Labels
Agent backport-v7.14.0 Automated backport with mergify backport-v7.15.0 Automated backport with mergify bug review Team:Elastic-Agent Label for the Agent team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@andrewkroh @elasticmachine @michel-laterman