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

[7.17](backport #40207) Change SQS metrics statistic method #40335

Merged
merged 4 commits into from
Jul 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 24, 2024

Proposed commit message

This PR is to fix statistic method applied to diff metrics in SQS metricset from aws module. This change has been done in elastic/integrations#8521 but didn't make it in Beats.

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

It will not, because rename processor renamed all the fields from sqs metricset already. Users need to pay attention to the documentation change on the field description. But dashboards will not be broken.


This is an automatic backport of pull request #40207 done by [Mergify](https://mergify.com).

* Change SQS metrics statistic method

* add doc change and changelog

(cherry picked from commit 918edab)

# Conflicts:
#	x-pack/metricbeat/module/aws/fields.go
@mergify mergify bot requested a review from a team as a code owner July 24, 2024 16:29
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 24, 2024
Copy link
Contributor Author

mergify bot commented Jul 24, 2024

Cherry-pick of 918edab has failed:

On branch mergify/bp/7.17/pr-40207
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 918edab6b8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   metricbeat/docs/fields.asciidoc
	modified:   x-pack/metricbeat/module/aws/sqs/_meta/fields.yml
	modified:   x-pack/metricbeat/module/aws/sqs/manifest.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/metricbeat/module/aws/fields.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

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

botelastic bot commented Jul 24, 2024

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

@kaiyan-sheng kaiyan-sheng merged commit 963e74e into 7.17 Jul 24, 2024
26 checks passed
@kaiyan-sheng kaiyan-sheng deleted the mergify/bp/7.17/pr-40207 branch July 24, 2024 20:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant