-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Prepare agent_with_custom_components.md for ddot. #28672
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
base: master
Are you sure you want to change the base?
Conversation
Preview links (active after the
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks very good! Added a couple of comments before we can merge.
agent_tag: "7.65.0-full" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since this file is not exclusive to the OTel telemetry docs, I would maybe call this agent_full_tag
just to be explicit 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file is exclusive to the OTel telemetry docs.
--build-arg AGENT_BRANCH="{{< version key="agent_branch" >}}" | ||
--build-arg AGENT_VERSION="{{< version key="agent_tag" >}}" \ | ||
--build-arg AGENT_BRANCH="{{< version key="agent_branch" >}}" \ | ||
--build-arg AGENT_REPO="datadog/agent" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As mentioned, since customers should use the release branch, I would maybe change the docs to indicate at step 0
to switch to the corresponding release branch/tag. We can use the agent_version
or agent_branch
variables for this, I think agent_version
is better.
I would then remove the AGENT_REPO
build arg, because it would be properly set in the Dockerfile, and should be transparent to the customer. I'd like to keep AGENT_REPO
as a bit of a hidden feature.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this PR, AGENT_REPO=datadog/agent-dev
. We have to set AGENT_REPO
to datadog/agent
when using tag, like 7.65.0-full
because tags are defined in repo datadog/agent
. Did I miss something?
What does this PR do? What is the motivation?
This PR updates agent_with_custom_components to use the agent full image.
Merge instructions
Merge readiness:
For Datadog employees:
Merge queue is enabled in this repo. Your branch name MUST follow the
<name>/<description>
convention and include the forward slash (/
). Without this format, your pull request will not pass in CI, the GitLab pipeline will not run, and you won't get a branch preview. Getting a branch preview makes it easier for us to check any issues with your PR, such as broken links.If your branch doesn't follow this format, rename it or create a new branch and PR.
To have your PR automatically merged after it receives the required reviews, add the following PR comment:
Additional notes