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

include system-probe in the build #19608

Merged
merged 2 commits into from
May 21, 2024

Conversation

joshrwolf
Copy link
Contributor

@joshrwolf joshrwolf commented May 16, 2024

this turned into a large PR, in general I assumed the existing package is wrong/broken, so I took quite a bit of liberty in restructuring things. the highlights of this change are:

  • bundles the system-probe component in the multicall agent
    • this uses kernel headers from debian stable 5.10.216-1~deb10u1 (to match what upstream is doing)
  • fixes the CGO impl by using the correct include paths
  • fixes the rtloader integration by using the correct --embedded-path
    • fixes the RPATH used by the agent to call the appropriate rtloader headers
  • creates a new datadog-agent-core-integrations subpackage that includes all the python plugin check integrations
    • installed using the py3.11 venv approach
    • pulls in a patch from upstream to simplify the discovery of checks
  • better matches the directory structure to upstream, including a few key hardcoded paths
    • place multicall symlinks to /opt/datadog-agent/embedded where the entrypoints are expecting
  • embed the jmx integration in the multicall, but separate the runtime dependency on openjdk as a separate package, included at image build time
  • downgrade go (1.21) and python (3.11) to match upstreams dependency locks

there's a lot of changes at once here, for some additional confidence, this has been tested (in its image form) against the standard docker and fargate setup

@joshrwolf joshrwolf force-pushed the datadog-agent-system-probe branch 2 times, most recently from f43fa80 to 8e52372 Compare May 16, 2024 14:22
Signed-off-by: Josh Wolf <josh@wolfs.io>
@joshrwolf joshrwolf force-pushed the datadog-agent-system-probe branch 10 times, most recently from 9156585 to ee50044 Compare May 21, 2024 19:20
Signed-off-by: Josh Wolf <josh@wolfs.io>
Copy link
Contributor

@xnox xnox left a comment

Choose a reason for hiding this comment

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

Looks good, minor comments to simplify things potentially.

datadog-agent.yaml Show resolved Hide resolved
datadog-agent.yaml Show resolved Hide resolved
Copy link
Contributor

@smoser smoser left a comment

Choose a reason for hiding this comment

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

lgtm.

@joshrwolf
Copy link
Contributor Author

going to land this as is to kick off a HEAD build, will address the nits in a follow up

@joshrwolf joshrwolf merged commit 419a625 into wolfi-dev:main May 21, 2024
7 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants