Skip to content

[AWS] Add support to configure owning account for AWS metrics integrations #11442

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
Merged
merged 14 commits into from
Oct 23, 2024
Merged

[AWS] Add support to configure owning account for AWS metrics integrations #11442

merged 14 commits into from
Oct 23, 2024

Conversation

Kavindu-Dodan
Copy link
Contributor

@Kavindu-Dodan Kavindu-Dodan commented Oct 16, 2024 •
edited
Loading

Proposed commit message

This PR adds support to configure Owning Account for AWS metrics integrations. The Owning Account property works together with Include Linked Accounts property. And it accepts an AWS account ID which should be a valid linked account ID of the monitoring account.

Checklist

  • I have reviewed tips for building integrations and this pull request is aligned with them.
  • I have verified that all data streams collect metrics or logs.
  • I have added an entry to my package's changelog.yml file.
  • I have verified that Kibana version constraints are current according to guidelines.
  • I have verified that any added dashboard complies with Kibana's Dashboard good practices

Related issues

Screenshots

Screenshot 2024-10-16 at 10 44 25 AM

@Kavindu-Dodan Kavindu-Dodan added enhancement New feature or request Team:obs-ds-hosted-services Observability Hosted Services team [elastic/obs-ds-hosted-services] labels Oct 16, 2024
@Kavindu-Dodan Kavindu-Dodan requested review from a team as code owners October 16, 2024 17:49
@Kavindu-Dodan Kavindu-Dodan force-pushed the feat/aws-owning-account-for-metrics branch from 1c32b57 to ab4e0ea Compare October 16, 2024 17:52
@andrewkroh andrewkroh added Integration:aws AWS Team:Obs-InfraObs Observability Infrastructure Monitoring team [elastic/obs-infraobs-integrations] Team:Security-Service Integrations Security Service Integrations team [elastic/security-service-integrations] labels Oct 16, 2024
@elasticmachine
Copy link

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

@elastic-vault-github-plugin-prod
Copy link

elastic-vault-github-plugin-prod bot commented Oct 16, 2024 •
edited
Loading

🚀 Benchmarks report

To see the full report comment with /test benchmark fullreport

@Kavindu-Dodan
Copy link
Contributor Author

@kaiyan-sheng the latest version works end to end without any issue. This commit 71a3190 fixed the integer conversation issue.

@Kavindu-Dodan Kavindu-Dodan force-pushed the feat/aws-owning-account-for-metrics branch 2 times, most recently from dd5ee44 to 764fa85 Compare October 18, 2024 13:51
kaiyan-sheng
kaiyan-sheng reviewed Oct 18, 2024
View reviewed changes
kaiyan-sheng
kaiyan-sheng reviewed Oct 18, 2024
View reviewed changes
kaiyan-sheng
kaiyan-sheng reviewed Oct 18, 2024
View reviewed changes
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng left a comment

Choose a reason for hiding this comment

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

It will be good to also add this new config in to aws_bedrock package :)

@Kavindu-Dodan
Copy link
Contributor Author

It will be good to also add this new config in to aws_bedrock package :)

ohh thanks for noticing this. I will add this :)

@Kavindu-Dodan Kavindu-Dodan force-pushed the feat/aws-owning-account-for-metrics branch from deb7c4f to 59e1f27 Compare October 18, 2024 21:51
@Kavindu-Dodan
Copy link
Contributor Author

It will be good to also add this new config in to aws_bedrock package :)

ohh thanks for noticing this. I will add this :)

@kaiyan-sheng done, added with commit 59e1f27

kaiyan-sheng
kaiyan-sheng reviewed Oct 18, 2024
View reviewed changes
@andrewkroh andrewkroh added the Integration:aws_bedrock Amazon Bedrock label Oct 18, 2024
efd6
efd6 approved these changes Oct 20, 2024
View reviewed changes
Copy link
Contributor

@efd6 efd6 left a comment

Choose a reason for hiding this comment

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

codeowner approval only (with nit)

@Kavindu-Dodan Kavindu-Dodan force-pushed the feat/aws-owning-account-for-metrics branch 2 times, most recently from a2f5a97 to 8a28151 Compare October 21, 2024 16:21
agithomas
agithomas reviewed Oct 22, 2024
View reviewed changes
@agithomas
Copy link
Contributor

Could you check if the aws_bedrock package also must receive this change?

@Kavindu-Dodan
Copy link
Contributor Author

Could you check if the aws_bedrock package also must receive this change?

Yeah, this is already included in the aws_bedrock integration - https://github.com/elastic/integrations/pull/11442/files#diff-c926417996626708e4db868273667118a2e9edb1fde0d50858531be8dc780c73

@Kavindu-Dodan Kavindu-Dodan force-pushed the feat/aws-owning-account-for-metrics branch from 243d43b to d7bfba4 Compare October 22, 2024 15:45
Kavindu-Dodan and others added 14 commits October 22, 2024 14:02
@Kavindu-Dodan
introduce owning account for AWS metrics integrations
0666a02 
Signed-off-by: Kavindu Dodanduwa <[email protected]>

# Conflicts:
#	packages/aws/changelog.yml
@Kavindu-Dodan
update build docs
a7e5c09 
Signed-off-by: Kavindu Dodanduwa <[email protected]>
@Kavindu-Dodan
update compatible beats version
ed0f366 
Signed-off-by: Kavindu Dodanduwa <[email protected]>
@Kavindu-Dodan
add missing property to agent
3d93180 
Signed-off-by: Kavindu Dodanduwa <[email protected]>
@Kavindu-Dodan
accept owning account as a string at agent
35067e2 
Signed-off-by: Kavindu Dodanduwa <[email protected]>
@Kavindu-Dodan
fix merge conflict and update changelog and version
54cbd0e 
Signed-off-by: Kavindu Dodanduwa <[email protected]>
@Kavindu-Dodan
make ownining account conditional
a0a65d0 
Signed-off-by: Kavindu Dodanduwa <[email protected]>
@Kavindu-Dodan
add ownining account support to aws bedrock
9d8894e 
Signed-off-by: Kavindu Dodanduwa <[email protected]>

# Conflicts:
#	packages/aws_bedrock/changelog.yml
@Kavindu-Dodan @kaiyan-sheng
Update packages/aws/_dev/build/docs/README.md
9f1b06b 
Co-authored-by: kaiyan-sheng <[email protected]>
@Kavindu-Dodan @kaiyan-sheng
Update packages/aws/_dev/build/docs/README.md
ec42620 
Co-authored-by: kaiyan-sheng <[email protected]>
@Kavindu-Dodan
set 0.12.0 version for aws bedrock
f89ff59 
Signed-off-by: Kavindu Dodanduwa <[email protected]>
@Kavindu-Dodan
add newline
94e6900 
Signed-off-by: Kavindu Dodanduwa <[email protected]>
@Kavindu-Dodan
update build docs
a0857f8 
Signed-off-by: Kavindu Dodanduwa <[email protected]>
@Kavindu-Dodan
review suggestion - links to aws resources
4ca5449 
Signed-off-by: Kavindu Dodanduwa <[email protected]>
@Kavindu-Dodan Kavindu-Dodan force-pushed the feat/aws-owning-account-for-metrics branch from d7bfba4 to 4ca5449 Compare October 22, 2024 21:04
@elasticmachine
Copy link

💚 Build Succeeded

History

  • 💚 Build #17459 succeeded d7bfba4ea3d971bfe446fd66a7498deb9047be68
  • 💔 Build #17458 failed 243d43be480e7addbe237eed92a15fb966fc6a1c
  • 💚 Build #17425 succeeded 8a2815188ef4e83f1864d5878fbd2047f506570a
  • 💔 Build #17424 failed a2f5a974ffb63dcd80e6286d90e088c494f7953b
  • 💔 Build #17419 failed 57027fc6a46c449bc2f3f5500d1b0c665eab9624
  • 💔 Build #17363 failed 05914f9ca084d94f5bab04de2a4ebfc85630e922

@elastic-sonarqube Elastic SonarQube
Copy link

Quality Gate failed Quality Gate failed

Failed conditions
9.7% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube

agithomas
agithomas approved these changes Oct 23, 2024
View reviewed changes
Copy link
Contributor

@agithomas agithomas left a comment

Choose a reason for hiding this comment

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

LGTM!

@Kavindu-Dodan Kavindu-Dodan merged commit 23776ce into elastic:main Oct 23, 2024
4 of 5 checks passed
@elastic-vault-github-plugin-prod
Copy link

Package aws - 2.30.0 containing this change is available at https://epr.elastic.co/search?package=aws

@elastic-vault-github-plugin-prod
Copy link

Package aws_bedrock - 0.12.0 containing this change is available at https://epr.elastic.co/search?package=aws_bedrock

harnish-elastic pushed a commit to chavdaharnish/integrations that referenced this pull request Feb 4, 2025
@Kavindu-Dodan @kaiyan-sheng
[AWS] Add support to configure owning account for AWS metrics integra…
aa50110 
…tions (elastic#11442)

* introduce owning account for AWS metrics integrations

Signed-off-by: Kavindu Dodanduwa <[email protected]>

# Conflicts:
#	packages/aws/changelog.yml

* update build docs

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* update compatible beats version

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* add missing property to agent

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* accept owning account as a string at agent

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* fix merge conflict and update changelog and version

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* make ownining account conditional

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* add ownining account support to aws bedrock

Signed-off-by: Kavindu Dodanduwa <[email protected]>

# Conflicts:
#	packages/aws_bedrock/changelog.yml

* Update packages/aws/_dev/build/docs/README.md

Co-authored-by: kaiyan-sheng <[email protected]>

* Update packages/aws/_dev/build/docs/README.md

Co-authored-by: kaiyan-sheng <[email protected]>

* set 0.12.0 version for aws bedrock

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* add newline

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* update build docs

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* review suggestion - links to aws resources

Signed-off-by: Kavindu Dodanduwa <[email protected]>

---------

Signed-off-by: Kavindu Dodanduwa <[email protected]>
Co-authored-by: kaiyan-sheng <[email protected]>
harnish-elastic pushed a commit to chavdaharnish/integrations that referenced this pull request Feb 5, 2025
@Kavindu-Dodan @kaiyan-sheng
[AWS] Add support to configure owning account for AWS metrics integra…
3abb78f 
…tions (elastic#11442)

* introduce owning account for AWS metrics integrations

Signed-off-by: Kavindu Dodanduwa <[email protected]>

# Conflicts:
#	packages/aws/changelog.yml

* update build docs

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* update compatible beats version

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* add missing property to agent

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* accept owning account as a string at agent

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* fix merge conflict and update changelog and version

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* make ownining account conditional

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* add ownining account support to aws bedrock

Signed-off-by: Kavindu Dodanduwa <[email protected]>

# Conflicts:
#	packages/aws_bedrock/changelog.yml

* Update packages/aws/_dev/build/docs/README.md

Co-authored-by: kaiyan-sheng <[email protected]>

* Update packages/aws/_dev/build/docs/README.md

Co-authored-by: kaiyan-sheng <[email protected]>

* set 0.12.0 version for aws bedrock

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* add newline

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* update build docs

Signed-off-by: Kavindu Dodanduwa <[email protected]>

* review suggestion - links to aws resources

Signed-off-by: Kavindu Dodanduwa <[email protected]>

---------

Signed-off-by: Kavindu Dodanduwa <[email protected]>
Co-authored-by: kaiyan-sheng <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaiyan-sheng kaiyan-sheng kaiyan-sheng approved these changes

@efd6 efd6 efd6 approved these changes

@agithomas agithomas agithomas approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request Integration:aws_bedrock Amazon Bedrock Integration:aws AWS Team:obs-ds-hosted-services Observability Hosted Services team [elastic/obs-ds-hosted-services] Team:Obs-InfraObs Observability Infrastructure Monitoring team [elastic/obs-infraobs-integrations] Team:Security-Service Integrations Security Service Integrations team [elastic/security-service-integrations]
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[AWS] Support owning account for cross account monitoring
6 participants
@Kavindu-Dodan @elasticmachine @agithomas @kaiyan-sheng @efd6 @andrewkroh