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

Fix rds metadata in cloudwatch metricset #29106

Merged
merged 3 commits into from
Nov 24, 2021
Merged

Fix rds metadata in cloudwatch metricset #29106

merged 3 commits into from
Nov 24, 2021

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Nov 23, 2021 •
edited
Loading

What does this PR do?

This PR is to fix rds identifier overwriting each other in cloudwatch metricset.

After fixing the bug:
Screen Shot 2021-11-23 at 10 10 58 AM

Before fixing the bug:
Screen Shot 2021-11-23 at 10 11 04 AM

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 Nov 23, 2021
@kaiyan-sheng kaiyan-sheng self-assigned this Nov 23, 2021
@mergify
Copy link
Contributor

mergify bot commented Nov 23, 2021

This pull request does not have a backport label. Could you fix it @kaiyan-sheng? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Nov 23, 2021
@kaiyan-sheng kaiyan-sheng added the Team:Integrations Label for the Integrations team label Nov 23, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 23, 2021
@kaiyan-sheng kaiyan-sheng added the backport-v7.16.0 Automated backport with mergify label Nov 23, 2021
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Nov 23, 2021
@kaiyan-sheng kaiyan-sheng added backport-skip Skip notification from the automated backport with mergify backport-v8.0.0 Automated backport with mergify labels Nov 23, 2021
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Nov 23, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 23, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-11-23T17:05:15.236+0000

  • Duration: 81 min 57 sec

  • Commit: f790376

Test stats 🧪

Test Results
Failed 0
Passed 2661
Skipped 240
Total 2901

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@aspacca aspacca mentioned this pull request Nov 23, 2021
Closed
3 tasks
@kaiyan-sheng kaiyan-sheng merged commit 5594923 into elastic:master Nov 24, 2021
@kaiyan-sheng kaiyan-sheng deleted the rds_metadata branch November 24, 2021 16:02
mergify bot pushed a commit that referenced this pull request Nov 24, 2021
@kaiyan-sheng
Fix rds metadata in cloudwatch metricset (#29106)
a7f56d8 
(cherry picked from commit 5594923)
@mergify mergify bot mentioned this pull request Nov 24, 2021
Merged
mergify bot pushed a commit that referenced this pull request Nov 24, 2021
@kaiyan-sheng
Fix rds metadata in cloudwatch metricset (#29106)
8555427 
(cherry picked from commit 5594923)
@mergify mergify bot mentioned this pull request Nov 24, 2021
Merged
kaiyan-sheng added a commit that referenced this pull request Nov 24, 2021
@mergify @kaiyan-sheng
Fix rds metadata in cloudwatch metricset (#29106) (#29130)
dd47e88 
(cherry picked from commit 5594923)

Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co>
kaiyan-sheng added a commit that referenced this pull request Nov 24, 2021
@mergify @kaiyan-sheng
[7.16](backport #29106) Fix rds metadata in cloudwatch metricset (#29129
d490c1c 
)

* Fix rds metadata in cloudwatch metricset (#29106)

(cherry picked from commit 5594923)

* Update CHANGELOG.next.asciidoc

Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co>
v1v added a commit to v1v/beats that referenced this pull request Nov 30, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/use-debian-9
53d5763 
* upstream/master: (577 commits)
  Remove Journalbeat (elastic#29131)
  Add note that there is no warranty or support for generator code (elastic#28797)
  packetbeat: preparation for npcap addition (elastic#29017)
  Use the generic helper for opening file to read in filestream (elastic#29180)
  Workflow for macos (elastic#29174)
  Fix `decode_json_fields` processor to always add error key (elastic#29107)
  Workflow for macos (elastic#29156)
  Fix agent download timeout values in yaml files (elastic#29039)
  Added workflow file for builds with macos (elastic#29148)
  CI: enable AWS cloud testing on a PR basis if changes in certain files (elastic#29047)
  Remove links to Journalbeat (elastic#29134)
  Fix rds metadata in cloudwatch metricset (elastic#29106)
  [mergify]: notify conflicts in PRs that are still open (elastic#29122)
  Use NamedWatcher in Agent's k8s provider (elastic#29095)
  override host on statsd metricset (elastic#29103)
  Skip config check in autodiscover for duplicated configurations (elastic#29048)
  Change "filebeat.config.modules.enabled" to "true" (elastic#28769)
  Remove deprecated spool queue from Beats (elastic#28869)
  Add `beat` field back to beat.stats (elastic#29094)
  Revert "Move labels and annotations under kubernetes.namespace. (elastic#27917)" (elastic#29069)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aspacca aspacca aspacca approved these changes

Assignees

@kaiyan-sheng kaiyan-sheng

Labels
backport-v7.16.0 Automated backport with mergify backport-v8.0.0 Automated backport with mergify Team:Integrations Label for the Integrations team
Projects
None yet
Milestone
No milestone
Development

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