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

Cherry-pick #19688 to 7.x: Deprecate tags.resource_type_filter config parameter and replace with resource_type #19762

Merged
merged 2 commits into from
Jul 9, 2020
Merged

Cherry-pick #19688 to 7.x: Deprecate tags.resource_type_filter config parameter and replace with resource_type #19762

merged 2 commits into from
Jul 9, 2020

Conversation

kaiyan-sheng
Copy link
Contributor

Cherry-pick of PR #19688 to 7.x branch. Original message:

This PR is to replace tags.resource_type_filter with a shorter more clear name resource_type in cloudwatch metricset.

With deprecating tags in #16733, when running cloudwatch metricset we will always get a warning message in the log about tags is deprecated. With renaming tags.resource_type_filter to resource_type, the warning log will not show up.

@kaiyan-sheng
Deprecate tags.resource_type_filter config parameter and replace with…
99bc969 
… resource_type (#19688)

* Deprecate tags.resource_type_filter config parameter

(cherry picked from commit 88ea437)
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 8, 2020
@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 8, 2020
@kaiyan-sheng kaiyan-sheng self-assigned this Jul 8, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 8, 2020 •
edited
Loading

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #19762 updated]

  • Start Time: 2020-07-09T15:38:09.734+0000

  • Duration: 78 min 47 sec

Test stats 🧪

Test Results
Failed 0
Passed 3387
Skipped 796
Total 4183

Steps errors

Expand to view the steps failures

  • Name: Report to Codecov

    • Description: curl -sSLo codecov https://codecov.io/bash for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat do FILE="${i}/build/coverage/full.cov" if [ -f "${FILE}" ]; then bash codecov -f "${FILE}" fi done

    • Duration: 2 min 22 sec

    • Start Time: 2020-07-09T16:03:32.240+0000

    • log

  • Name: Report to Codecov

    • Description: curl -sSLo codecov https://codecov.io/bash for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat do FILE="${i}/build/coverage/full.cov" if [ -f "${FILE}" ]; then bash codecov -f "${FILE}" fi done

    • Duration: 2 min 22 sec

    • Start Time: 2020-07-09T16:17:56.692+0000

    • log

ChrsMark
ChrsMark approved these changes Jul 9, 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.

lgtm! Just to note that there is file missing from this backport https://github.com/elastic/beats/pull/19688/files#diff-ec63200cdf0ec2935dfc7b529aef7fbbL82. Is this intentional?

@kaiyan-sheng
Copy link
Contributor Author

@ChrsMark Thanks for reviewing! Yes, config.epr.yml is for migrating aws package and is not backported to 7.x.

@kaiyan-sheng kaiyan-sheng merged commit 099f318 into elastic:7.x Jul 9, 2020
@kaiyan-sheng kaiyan-sheng deleted the backport_19688_7.x branch July 9, 2020 18:03
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
backport Team:Platforms Label for the Integrations - Platforms team [zube]: In Review
Projects
None yet
Milestone
No milestone
Development

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