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.

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

[Elastic Agent] Fix missing elastic_agent event data #21994

Merged
merged 6 commits into from
Oct 20, 2020

Conversation

blakerouse
Copy link
Contributor

What does this PR do?

Fixes the events pushed by Elastic Agent monitoring to have the elastic_agent.* fields. This also updates the fields from elastic.agent.id to elastic_agent.id to match the datasource that was change to elastic_agent.

Why is it important?

So all events can be coordinated to an Agent.

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

@blakerouse blakerouse added needs_backport PR is waiting to be backported to other branches. Team:Ingest Management labels Oct 19, 2020
@blakerouse blakerouse self-assigned this Oct 19, 2020
@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 19, 2020
@blakerouse blakerouse marked this pull request as ready for review October 19, 2020 18:26
@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 19, 2020

💚 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 #21994 updated]

  • Start Time: 2020-10-20T14:36:06.315+0000

  • Duration: 38 min 13 sec

Test stats 🧪

Test Results
Failed 0
Passed 1394
Skipped 4
Total 1398

@blakerouse blakerouse force-pushed the fix-monitoring-agent-info branch from 380bb64 to de21e61 Compare October 20, 2020 13:08
Copy link
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 you will probably need to run mage fmt to fix imports

@blakerouse blakerouse merged commit 610e998 into elastic:master Oct 20, 2020
@blakerouse blakerouse deleted the fix-monitoring-agent-info branch October 20, 2020 16:29
blakerouse added a commit to blakerouse/beats that referenced this pull request Oct 20, 2020
* Fix fields.

* Remove from monitoring decorator.

* Add changelog.

* Fix tests.

* Fix tests.

* Fix import.

(cherry picked from commit 610e998)
@blakerouse blakerouse added v7.11.0 and removed needs_backport PR is waiting to be backported to other branches. labels Oct 20, 2020
blakerouse added a commit to blakerouse/beats that referenced this pull request Oct 20, 2020
* Fix fields.

* Remove from monitoring decorator.

* Add changelog.

* Fix tests.

* Fix tests.

* Fix import.

(cherry picked from commit 610e998)
v1v added a commit to v1v/beats that referenced this pull request Oct 21, 2020
…ter-commit

* upstream/master:
  feat: package aliases for snapshots (elastic#21960)
  [DOC] Add firewall as possible troubleshooting issue (elastic#21743)
  [Filebeat] Add max_number_of_messages config parameter for S3 input (elastic#21993)
  [Elastic Agent] Fix missing elastic_agent event data  (elastic#21994)
  Document auditbeat system process module config (elastic#21766)
  Update links (elastic#22012)
v1v added a commit to v1v/beats that referenced this pull request Oct 21, 2020
* upstream/master:
  feat: package aliases for snapshots (elastic#21960)
  [DOC] Add firewall as possible troubleshooting issue (elastic#21743)
  [Filebeat] Add max_number_of_messages config parameter for S3 input (elastic#21993)
  [Elastic Agent] Fix missing elastic_agent event data  (elastic#21994)
  Document auditbeat system process module config (elastic#21766)
  Update links (elastic#22012)
  dynamically find librpm (elastic#21936)
  Fix Istio docs (elastic#22019)
  [beats-tester][packaging] store packages in another location (elastic#21903)
  [Kubernetes] Remove redundant dockersock volume mount (elastic#22009)
  [Ingest Manager] Always try snapshot repo for agent upgrade (elastic#21951)
  Azure storage metricset values not inside the metricset name (elastic#21845)
  fix diskio and memory bugs under windows (elastic#21992)
  Fix TestDockerStart flaky test (elastic#21681)
  filebeat: add SSL options to checkpoint module (elastic#19560)
  Stop storing stateless kubernetes keystores (elastic#21880)
  [Elastic Agent] Fix named pipe communication on Windows 7 (elastic#21931)
  [Elastic Agent] Fix index for Agent monitoring to to elastic_agent. (elastic#21932)
blakerouse added a commit that referenced this pull request Oct 21, 2020
…event data (#22032)

* [Elastic Agent] Fix missing elastic_agent event data  (#21994)

* Fix fields.

* Remove from monitoring decorator.

* Add changelog.

* Fix tests.

* Fix tests.

* Fix import.

(cherry picked from commit 610e998)

* Update CHANGELOG.next.asciidoc
blakerouse added a commit that referenced this pull request Oct 21, 2020
… event data (#22033)

* [Elastic Agent] Fix missing elastic_agent event data  (#21994)

* Fix fields.

* Remove from monitoring decorator.

* Add changelog.

* Fix tests.

* Fix tests.

* Fix import.

(cherry picked from commit 610e998)

* Update CHANGELOG.next.asciidoc
v1v added a commit to v1v/beats that referenced this pull request Oct 22, 2020
* upstream/master: (27 commits)
  chore: use ubuntu 18 as linux agent (elastic#22084)
  docs: Prepare Changelog for 7.9.3 (elastic#22073) (elastic#22075)
  docs: Prepare Changelog for 6.8.13 (elastic#22072) (elastic#22079)
  [build][packaging] Add resilience when docker build (elastic#22050)
  Fix the url of reviewdog (elastic#21981)
  revert WSS process reporting for windows (elastic#22055)
  Fix typo (elastic#19585) (elastic#22061)
  [Ingest Manager] Use ML_SYSTEM to detect if agent is running as a service (elastic#21884)
  Prevent log input from sending duplicate messages due to file renaming (elastic#21911)
  feat: package aliases for snapshots (elastic#21960)
  [DOC] Add firewall as possible troubleshooting issue (elastic#21743)
  [Filebeat] Add max_number_of_messages config parameter for S3 input (elastic#21993)
  [Elastic Agent] Fix missing elastic_agent event data  (elastic#21994)
  Document auditbeat system process module config (elastic#21766)
  Update links (elastic#22012)
  dynamically find librpm (elastic#21936)
  Fix Istio docs (elastic#22019)
  [beats-tester][packaging] store packages in another location (elastic#21903)
  [Kubernetes] Remove redundant dockersock volume mount (elastic#22009)
  [Ingest Manager] Always try snapshot repo for agent upgrade (elastic#21951)
  ...
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.

Elastic agent monitoring logs/metrics doesn't have elastic.agent.* fields
3 participants