Skip to content

Cherry-pick #21543 to 7.x: [Elastic Agent] Add elastic agent ID and version to events from filebeat and metricbeat.#21566

Merged
blakerouse merged 1 commit intoelastic:7.xfrom
blakerouse:backport_21543_7.x
Oct 6, 2020
Merged

Cherry-pick #21543 to 7.x: [Elastic Agent] Add elastic agent ID and version to events from filebeat and metricbeat.#21566
blakerouse merged 1 commit intoelastic:7.xfrom
blakerouse:backport_21543_7.x

Conversation

@blakerouse
Copy link
Copy Markdown
Contributor

@blakerouse blakerouse commented Oct 6, 2020

Cherry-pick of PR #21543 to 7.x branch. Original message:

What does this PR do?

Adds the elastic.agent.id, elastic.agent.version, and elastic.agent.snapshot to all events published from filebeat and metricbeat inputs. This includes when filebeat/metricbeat is monitoring the running Elastic Agent itself.

Why is it important?

So it's clear which Elastic Agent sent the events. Elastic Agent has never included this information with each event.

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

@elasticmachine
Copy link
Copy Markdown
Contributor

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

@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 Oct 6, 2020
@blakerouse blakerouse self-assigned this Oct 6, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21566 opened]

  • Start Time: 2020-10-06T13:03:52.692+0000

  • Duration: 35 min 15 sec

Test stats 🧪

Test Results
Failed 0
Passed 1386
Skipped 4
Total 1390

…eat and metricbeat. (elastic#21543)

* Add elastic agent ID and version to events from filebeat and metricbeat.

* Add changelog and fix inputs.

(cherry picked from commit f5d13aa)
Copy link
Copy Markdown
Contributor

@michalpristas michalpristas left a comment

Choose a reason for hiding this comment

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

Looks ok

@blakerouse blakerouse merged commit 538cc11 into elastic:7.x Oct 6, 2020
@blakerouse blakerouse deleted the backport_21543_7.x branch October 6, 2020 14:13
@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21566 updated]

  • Start Time: 2020-10-06T13:42:10.564+0000

  • Duration: 37 min 32 sec

Test stats 🧪

Test Results
Failed 0
Passed 1386
Skipped 4
Total 1390

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants