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.

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

[8.13](backport #38669) add_cloud_metadata: env var override for providers #38965

Merged
merged 2 commits into from
Apr 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 16, 2024

Proposed commit message

Add support for configuring the add_cloud_metadata providers with an environment variable, $BEATS_ADD_CLOUD_METADATA_PROVIDERS. This may be useful when deploying Elastic Agent standalone in a cloud provider (e.g. in a managed Kubernetes cluster), where the cloud provider is known at deployment time.

This is intended as a workaround for #13816 and issues like it.

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.

How to test this PR locally

Run Metricbeat enough times on EC2 to trigger #13816, and then check that setting BEATS_ADD_CLOUD_METADATA_PROVIDERS=ec2 disables the openstack provider and the issue no longer occurs.

Related issues

Relates to #13816

Use cases

As a user deploying Elastic Agent standalone on EKS, I want to ensure that documents are enriched with EC2 cloud metadata.

Screenshots

N/A

Logs

N/A


This is an automatic backport of pull request #38669 done by Mergify.

* add_cloud_metadata: env var override for providers

Add support for configuring the add_cloud_metadata providers
with an environment variable, $BEATS_ADD_CLOUD_METADATA_PROVIDERS.

This may be useful when deploying Elastic Agent standalone in a
cloud provider managed Kubernetes cluster, where the cloud provider
is known at deployment time.

* Fix changelog

* appease golangci-lint

* More appeasement

(cherry picked from commit d0399e0)
@mergify mergify bot requested a review from a team as a code owner April 16, 2024 09:47
@mergify mergify bot added the backport label Apr 16, 2024
@mergify mergify bot assigned axw Apr 16, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 16, 2024
@botelastic
Copy link

botelastic bot commented Apr 16, 2024

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 16, 2024

💚 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

  • Duration: 134 min 9 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the 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!)

Copy link
Contributor

@MichaelKatsoulis MichaelKatsoulis left a comment

Choose a reason for hiding this comment

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

Just one comment on my side for the changelog.

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@axw axw enabled auto-merge (squash) April 16, 2024 13:08
@axw axw merged commit 6951e5e into 8.13 Apr 16, 2024
130 checks passed
@axw axw deleted the mergify/bp/8.13/pr-38669 branch April 16, 2024 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants