[MetricBeat] add param aws_partition to support aws-cn, aws-us-gov regions#19423
Merged
kaiyan-sheng merged 3 commits intoelastic:masterfrom Jun 30, 2020
Merged
Conversation
Contributor
|
Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually? |
1 similar comment
Contributor
|
Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually? |
aws_partition to support other aws region: aws-cn, aws-u…aws_partition to support other aws region: aws-cn, aws-u…
aws_partition to support other aws region: aws-cn, aws-u…aws_partition to support: aws-cn, aws-us-gov region
aws_partition to support: aws-cn, aws-us-gov regionaws_partition to support: aws-cn, aws-us-gov region
Contributor
❕ Build Aborted
Expand to view the summary
Build stats
Steps errorsExpand to view the steps failures
Log outputExpand to view the last 100 lines of log output
|
aws_partition to support: aws-cn, aws-us-gov regionaws_partition to support aws-cn, aws-us-gov regions
55b3d1b to
5b6dc38
Compare
Contributor
|
jenkins, test this please |
Contributor
|
Thanks for working on both changes!! Sorry for the delay, I will review them today!! |
kaiyan-sheng
approved these changes
Jun 30, 2020
Contributor
kaiyan-sheng
left a comment
There was a problem hiding this comment.
Tested locally and it works. Thank you for the contribution! I will merge this PR and get it backported.
Contributor
|
run tests please |
6 tasks
kaiyan-sheng
pushed a commit
that referenced
this pull request
Jun 30, 2020
kaiyan-sheng
pushed a commit
that referenced
this pull request
Jul 1, 2020
kaiyan-sheng
pushed a commit
that referenced
this pull request
Jul 1, 2020
…support aws-cn, aws-us-gov regions (#19519) * [MetricBeat] add param `aws_partition` to support aws-cn, aws-us-gov regions (#19423) * add params `aws_partition` to support other aws region: aws-cn, aws-us-gov (cherry picked from commit 1ea8c84) Co-authored-by: martin <kwinstonix@users.noreply.github.com>
v1v
added a commit
to v1v/beats
that referenced
this pull request
Jul 2, 2020
…ne-beats * upstream/master: (105 commits) ci: enable packaging job (elastic#19536) ci: disable upstream trigger on PRs for the packaging job (elastic#19490) Implement memlog on-disk handling (elastic#19408) fix go.mod for PR elastic#19423 (elastic#19521) [MetricBeat] add param `aws_partition` to support aws-cn, aws-us-gov regions (elastic#19423) Input v2 stateless manager (elastic#19406) Input v2 compatibility layer (elastic#19401) [Elastic Agent] Fix artifact downloading to allow endpoint-security to be downloaded (elastic#19503) fix: ignore target changes on scans (elastic#19510) Add more helpers to pipeline/testing package (elastic#19405) Report dependencies in CSV format (elastic#19506) [Filebeat] Fix reference leak in TCP and Unix socket inputs (elastic#19459) Cursor input skeleton (elastic#19378) Add changelog. (elastic#19495) [DOC] Typo in Kerberos (elastic#19265) Remove accidentally commited unused NOTICE template (elastic#19485) [Elastic Agent] Support the install, control, and uninstall of Endpoint (elastic#19248) [Filebeat][httpjson] Add split_events_by config setting (elastic#19246) ci: disabling packaging job until we fix it (elastic#19481) Fix golang.org/x/tools to release1.13 (elastic#19478) ...
melchiormoulin
pushed a commit
to melchiormoulin/beats
that referenced
this pull request
Oct 14, 2020
…regions (elastic#19423) * add params `aws_partition` to support other aws region: aws-cn, aws-us-gov
melchiormoulin
pushed a commit
to melchiormoulin/beats
that referenced
this pull request
Oct 14, 2020
melchiormoulin
pushed a commit
to melchiormoulin/beats
that referenced
this pull request
Oct 14, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR is to add a parameter
aws_partitionfor metricbeat aws cloudwatch module, so metricbeat can support aws china and aws us-gov account.Why is it important?
Because there are three partitions
aws, aws-cn, aws-us-govof aws regions, now metricbeat can only support aws global region, here is a hardcode.beats/x-pack/metricbeat/module/aws/aws.go
Lines 95 to 100 in 5ba7026
Checklist
CHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.How to test this PR locally
aws_partitionparam in aws module configRelated issues
Use cases
Screenshots
aws global account, set
aws_partition: awsin aws module config or remove the paramaws china account, set
aws_partition: aws-cnin aws module config