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] Fix tags_filter for cloudwatch metricset in aws module #18524

Merged
merged 3 commits into from
May 18, 2020
Merged

[Metricbeat] Fix tags_filter for cloudwatch metricset in aws module #18524

merged 3 commits into from
May 18, 2020

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented May 14, 2020 •
edited
Loading

What does this PR do?

This PR is to fix tags_filter for cloudwatch metricset. Without this fix, when user tries to specify tags_filter in aws module config, it does not apply the filter on what events to send to ES.

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.

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 14, 2020
@kaiyan-sheng kaiyan-sheng self-assigned this May 14, 2020
@kaiyan-sheng kaiyan-sheng added bug Metricbeat Metricbeat needs_backport PR is waiting to be backported to other branches. Team:Platforms Label for the Integrations - Platforms team and removed needs_team Indicates that the issue/PR needs a Team:* label labels May 14, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 14, 2020 •
edited
Loading

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

Test stats 🧪

Test Results
Failed 0
Passed 367
Skipped 39
Total 406

ChrsMark
ChrsMark reviewed May 18, 2020
View reviewed changes
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

codewise lgtm!
Wondering if we should document this behaviour in the docs 🤔 .

x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go Show resolved Hide resolved
@kaiyan-sheng kaiyan-sheng merged commit 5aa3d0c into elastic:master May 18, 2020
@kaiyan-sheng kaiyan-sheng deleted the tags_filter_bug branch May 18, 2020 15:03
@kaiyan-sheng kaiyan-sheng mentioned this pull request May 18, 2020
Merged
6 tasks
@kaiyan-sheng kaiyan-sheng added v7.9.0 and removed needs_backport PR is waiting to be backported to other branches. labels May 18, 2020
@kaiyan-sheng kaiyan-sheng mentioned this pull request May 18, 2020
Merged
6 tasks
@kaiyan-sheng kaiyan-sheng mentioned this pull request May 18, 2020
Merged
6 tasks
kaiyan-sheng added a commit that referenced this pull request May 18, 2020
@kaiyan-sheng
Cherry-pick #18524 to 7.7: [Metricbeat] Fix tags_filter for cloudwatc…
d75329c 
…h metricset in aws module (#18618)

* [Metricbeat] Fix tags_filter for cloudwatch metricset in aws module (#18524)

* Fix tags_filter for cloudwatch metricset
* if tags_filter is given, overwrite tags in cloudwatch specific config

(cherry picked from commit 5aa3d0c)
kaiyan-sheng added a commit that referenced this pull request May 18, 2020
@kaiyan-sheng
[Metricbeat] Fix tags_filter for cloudwatch metricset in aws module (#…
67c6561 
…18524) (#18617)

* Fix tags_filter for cloudwatch metricset
* if tags_filter is given, overwrite tags in cloudwatch specific config

(cherry picked from commit 5aa3d0c)
kaiyan-sheng added a commit that referenced this pull request May 18, 2020
@kaiyan-sheng
[Metricbeat] Fix tags_filter for cloudwatch metricset in aws module (#…
7dba342 
…18524) (#18616)

* Fix tags_filter for cloudwatch metricset
* if tags_filter is given, overwrite tags in cloudwatch specific config

(cherry picked from commit 5aa3d0c)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@kaiyan-sheng
Cherry-pick elastic#18524 to 7.7: [Metricbeat] Fix tags_filter for cl…
f928a66 
…oudwatch metricset in aws module (elastic#18618)

* [Metricbeat] Fix tags_filter for cloudwatch metricset in aws module (elastic#18524)

* Fix tags_filter for cloudwatch metricset
* if tags_filter is given, overwrite tags in cloudwatch specific config

(cherry picked from commit 0d56bc8)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChrsMark ChrsMark ChrsMark approved these changes

Assignees

@kaiyan-sheng kaiyan-sheng

Labels
bug Metricbeat Metricbeat review Team:Platforms Label for the Integrations - Platforms team v7.7.1 v7.8.0 v7.9.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kaiyan-sheng @elasticmachine @ChrsMark @andresrc