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

Update to elastic/beats@ef6274d0d1e3 #4249

Merged
merged 6 commits into from
Oct 2, 2020
Merged

Update to elastic/beats@ef6274d0d1e3 #4249

merged 6 commits into from
Oct 2, 2020

Conversation

axw
Copy link
Member

@axw axw commented Sep 30, 2020

Motivation/summary

Brings in elastic/beats#21113

Checklist

I have considered changes for:
- [ ] documentation
- [ ] logging (add log lines, choose appropriate log selector, etc.)
- [ ] metrics and monitoring (create issue for Kibana team to add metrics to visualizations, e.g. Kibana#44001)

How to test these changes

Run apm-server on Linux with monitoring enabled, observe cgroup metrics are published.

Related issues

Part of #4070

Copy link
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

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

The latest beats changes also contain making the template configurable elastic/beats#21212. This is not yet supported by APM Server. It's probably good enough to just not document and officially support it. We could also ensure to always overwrite the config to legacy for now.

@axw
Copy link
Member Author

axw commented Sep 30, 2020

The latest beats changes also contain making the template configurable elastic/beats#21212. This is not yet supported by APM Server. It's probably good enough to just not document and officially support it. We could also ensure to always overwrite the config to legacy for now.

Thanks for the heads up. I think it's fine to just not document it, and say we don't support it.

@apmmachine
Copy link
Contributor

apmmachine commented Sep 30, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #4249 updated]

  • Start Time: 2020-10-02T07:00:00.274+0000

  • Duration: 44 min 37 sec

Test stats 🧪

Test Results
Failed 0
Passed 4032
Skipped 145
Total 4177

Steps errors

Expand to view the steps failures

  • Name: Compress

    • Description: tar --exclude=coverage-files.tgz -czf coverage-files.tgz coverage

    • Duration: 0 min 0 sec

    • Start Time: 2020-10-02T07:15:33.583+0000

    • log

  • Name: Compress

    • Description: tar --exclude=system-tests-linux-files.tgz -czf system-tests-linux-files.tgz system-tests

    • Duration: 0 min 0 sec

    • Start Time: 2020-10-02T07:27:49.180+0000

    • log

@axw axw requested a review from a team September 30, 2020 09:48
@codecov-commenter
Copy link

codecov-commenter commented Oct 1, 2020

Codecov Report

Merging #4249 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #4249   +/-   ##
=======================================
  Coverage   80.07%   80.07%           
=======================================
  Files         158      158           
  Lines        7958     7958           
=======================================
  Hits         6372     6372           
  Misses       1586     1586           

@axw
Copy link
Member Author

axw commented Oct 1, 2020

System tests are failing because of an issue in Kibana, should be fixed by elastic/kibana#78941 in the next snapshot.

@axw axw merged commit 5321e77 into elastic:master Oct 2, 2020
@axw axw deleted the update-beats branch October 2, 2020 08:11
axw added a commit to axw/apm-server that referenced this pull request Oct 2, 2020
* Update to elastic/beats@ef6274d0d1e3

Brings in elastic/beats#21113

* tests/system: add geo.country_name to approvals

elastic/elasticsearch#61523

* Update docs

* systemtest: another country_name approval
axw added a commit that referenced this pull request Oct 5, 2020
* Update to elastic/beats@ef6274d0d1e3

Brings in elastic/beats#21113

* tests/system: add geo.country_name to approvals

elastic/elasticsearch#61523

* Update docs

* systemtest: another country_name approval
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants