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

Add support for passing extra claiming options when claiming with Docker. #12457

Merged
merged 1 commit into from
Mar 30, 2022

Conversation

Ferroin
Copy link
Member

@Ferroin Ferroin commented Mar 18, 2022

Summary

This adds a new environment variable to our entrypoint script named NETDATA_EXTRA_CLAIM_OPTS. The contents of this variable will be passed directly (with word splitting) to the claiming script if it is invoked by the Docker entrypoint, allowing passing of arbitrary additional options.

Test Plan

A simple test with a locally built Docker image can be done by adding -e NETDATA_EXTRA_CLAIM_OPTS=-verbose to the options passed to docker run when creating the image.

Without the changes in this PR, the claiming process should produce it’s normal terse output.

With the changes in this PR, the claiming process should produce verbose output.

@github-actions github-actions bot added the area/packaging Packaging and operating systems support label Mar 18, 2022
@Ferroin Ferroin changed the title Add spport for passing extraclaiming options when claiming with Docker. Add support for passing extra claiming options when claiming with Docker. Mar 21, 2022
Copy link
Member

@ilyam8 ilyam8 left a comment

Choose a reason for hiding this comment

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

LGTM but updating https://learn.netdata.cloud/docs/agent/claim#using-environment-variables would make this PR even more awesome

@Ferroin Ferroin merged commit 0fb2107 into netdata:master Mar 30, 2022
@Ferroin Ferroin deleted the docker-arbitrary-claim-opts branch March 30, 2022 11:22
maneamarius pushed a commit to maneamarius/netdata that referenced this pull request Apr 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/packaging Packaging and operating systems support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants