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

metricbeat: Update beat module with apm-server monitoring metrics fields #40127

Merged
merged 4 commits into from
Jul 10, 2024
Merged

metricbeat: Update beat module with apm-server monitoring metrics fields #40127

merged 4 commits into from
Jul 10, 2024

Conversation

carsonip
Copy link
Member

@carsonip carsonip commented Jul 5, 2024 •
edited
Loading

Proposed commit message

  • Update metricbeat beat module mapping to contain latest apm-server monitoring metrics fields
  • Update schema to parse output fields from stats
  • Update tests

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.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

  • Start apm-server with monitoring
  • Start standalone metricbeat with beat module
  • Confirm that fields are mapped correctly in metricbeat-* data stream

Manual testing results described in elastic/apm-server#13475

Related issues

Use cases

Screenshots

Logs

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 5, 2024
@botelastic
Copy link

botelastic bot commented Jul 5, 2024

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

@carsonip carsonip changed the title metricbeat: Update beat module with apm-server fields metricbeat: Update beat module with apm-server monitoring metrics fields Jul 5, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Jul 5, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @carsonip? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@carsonip carsonip added bug backport-v8.14.0 Automated backport with mergify backport-8.15 Automated backport to the 8.15 branch with mergify and removed backport-v8.14.0 Automated backport with mergify labels Jul 5, 2024
carsonip
carsonip commented Jul 9, 2024
View reviewed changes
metricbeat/module/beat/stats/data.go
@@ -35,6 +35,7 @@ var (
"cgroup": c.Ifc("beat.cgroup"),
"system": c.Ifc("system"),
"apm_server": c.Ifc("apm-server"),
"output": c.Ifc("output"),
Copy link
Member Author

Choose a reason for hiding this comment

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

[to reviewer] this is required for beat.stats.output.elasticsearch.*

@carsonip carsonip mentioned this pull request Jul 9, 2024
Closed
@carsonip carsonip force-pushed the apm-server-metrics branch from 5f7fc5e to 8925c9f Compare July 9, 2024 14:17
@mergify Mergify
Copy link
Contributor

mergify bot commented Jul 9, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b apm-server-metrics upstream/apm-server-metrics
git merge upstream/main
git push upstream apm-server-metrics

@carsonip carsonip force-pushed the apm-server-metrics branch from 8925c9f to d5c0736 Compare July 9, 2024 14:21
@carsonip carsonip force-pushed the apm-server-metrics branch from d5c0736 to 249524c Compare July 9, 2024 14:22
carsonip
carsonip commented Jul 9, 2024
View reviewed changes
metricbeat/module/beat/stats/data_test.go
@@ -33,7 +33,7 @@ import (

func TestEventMapping(t *testing.T) {

files, err := filepath.Glob("./_meta/test/stats.*.json")
files, err := filepath.Glob("./_meta/test/*.stats.*.json")
Copy link
Member Author

Choose a reason for hiding this comment

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

[to reviewer] it wasn't testing apm-server.stats.712.json, not sure if it was intended.

Copy link
Contributor

Choose a reason for hiding this comment

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

no idea but we'll know if CI fails :)

CHANGELOG.next.asciidoc
@@ -175,6 +175,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- Fix query logic for temp and non-temp tablespaces in Oracle module. {issue}38051[38051] {pull}39787[39787]
- Set GCP metrics config period to the default (60s) when the value is below the minimum allowed period. {issue}30434[30434] {pull}40020[40020]
- Fix missing metrics from CloudWatch when include_linked_accounts set to false. {issue}40071[40071] {pull}40135[40135]
- Update beat module with apm-server monitoring metrics fields {pull}40127[40127]
Copy link
Member Author

Choose a reason for hiding this comment

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

[to reviewer] double checking: if we are looking to backport this PR to 8.15, is this still the right place for the changelog?

Copy link
Contributor

Choose a reason for hiding this comment

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

@elastic/beats would you know about that ?

@carsonip carsonip marked this pull request as ready for review July 9, 2024 14:24
@carsonip carsonip requested a review from a team as a code owner July 9, 2024 14:24
@carsonip carsonip mentioned this pull request Jul 9, 2024
Merged
4 tasks
@carsonip carsonip marked this pull request as draft July 9, 2024 15:10
@carsonip carsonip marked this pull request as ready for review July 9, 2024 16:42
@miltonhultgren miltonhultgren requested a review from klacabane July 10, 2024 10:25
klacabane
klacabane approved these changes Jul 10, 2024
View reviewed changes
Copy link
Contributor

@klacabane klacabane left a comment

Choose a reason for hiding this comment

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

LGTM

@carsonip carsonip merged commit d79d852 into elastic:main Jul 10, 2024
20 checks passed
mergify bot pushed a commit that referenced this pull request Jul 10, 2024
@carsonip @mergify
metricbeat: Update beat module with apm-server monitoring metrics fie…
75451ee 
…lds (#40127)

* Update metricbeat beat module mapping to contain latest apm-server monitoring metrics fields
* Update schema to parse output fields from stats
* Update tests

(cherry picked from commit d79d852)
@mergify mergify bot mentioned this pull request Jul 10, 2024
Merged
6 tasks
@carsonip carsonip mentioned this pull request Jul 10, 2024
Closed
9 tasks
carsonip added a commit that referenced this pull request Jul 10, 2024
@mergify @carsonip
metricbeat: Update beat module with apm-server monitoring metrics fie…
fda578f 
…lds (#40127) (#40167)

* Update metricbeat beat module mapping to contain latest apm-server monitoring metrics fields
* Update schema to parse output fields from stats
* Update tests

(cherry picked from commit d79d852)

Co-authored-by: Carson Ip <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@klacabane klacabane klacabane approved these changes

Assignees

@lahsivjar lahsivjar

@carsonip carsonip

Labels
backport-8.15 Automated backport to the 8.15 branch with mergify bug needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@carsonip @klacabane @lahsivjar