diff --git a/datadog-agent.yaml b/datadog-agent-7.72.yaml similarity index 95% rename from datadog-agent.yaml rename to datadog-agent-7.72.yaml index d0d1394e69d..52200b280e9 100644 --- a/datadog-agent.yaml +++ b/datadog-agent-7.72.yaml @@ -1,9 +1,9 @@ package: - name: datadog-agent + name: datadog-agent-7.72 # This package has two git checkouts. For each new release, the commit SHA for # DataDog/integrations-core must also be updated. version: "7.72.4" - epoch: 1 + epoch: 2 description: "Collect events and metrics from your hosts that send data to Datadog." copyright: - license: Apache-2.0 @@ -11,9 +11,11 @@ package: disabled: - setuidgid dependencies: + provides: + - datadog-agent=${{package.full-version}} runtime: + - ${{package.name}}-core-integrations - blkid - - datadog-agent-core-integrations - findutils - grep - libpcap @@ -40,6 +42,10 @@ var-transforms: # or until the next release we can use the 7.58.x branch of the DataDog/integrations-core repo replace: "$1.x" to: datadog-major-minor-x + - from: ${{package.version}} + match: ^(\d+\.\d+)\.\d+$ + replace: "$1" + to: major-minor-version environment: contents: @@ -129,11 +135,17 @@ pipeline: # install `gitlab` python${{vars.python-version}} -m pip install python-gitlab --root-user-action ignore + # Remediate GHSA-5rjg-fvgr-3xxf and GHSA-pq67-6m6q-mj2v + python${{vars.python-version}} -m pip install --upgrade setuptools==78.1.1 urllib3==2.5.0 + - uses: go/bump with: go-version: "1.24.7" # package built w/ go-1.24 - keeps tidy at 1.24.7, otherwise go mod tidy fails replaces: github.com/mholt/archiver/v3=github.com/anchore/archiver/v3@v3.5.2 show-diff: true + # GHSA-f6x5-jh6r-wrfv, GHSA-j5w8-q4qc-rx2x + deps: |- + golang.org/x/crypto@v0.45.0 - if: ${{build.arch}} == 'aarch64' name: Install clang-12 @@ -336,26 +348,30 @@ pipeline: - uses: strip subpackages: - - name: datadog-agent-jmx + - name: ${{package.name}}-jmx description: "Datadog agent with JMX integration" dependencies: + provides: + - datadog-agent-jmx=${{package.full-version}} runtime: - openjdk-11-default-jvm - - datadog-agent + - ${{package.name}} - datadog-jmxfetch pipeline: - runs: | mkdir -p ${{targets.contextdir}}/usr/bin/dist/jmx ln -sf "${{vars.destd}}/bin/agent/dist/jmx/jmxfetch.jar" "${{targets.contextdir}}/usr/bin/dist/jmx/jmxfetch.jar" - - name: datadog-agent-oci-compat + - name: ${{package.name}}-oci-compat dependencies: + provides: + - datadog-agent-oci-compat=${{package.full-version}} runtime: - bash - busybox - coreutils - findutils - - datadog-agent-s6-overlay + - ${{package.name}}-s6-overlay - datadog-security-agent-policies pipeline: - runs: | @@ -374,8 +390,10 @@ subpackages: cp -r Dockerfiles/agent/entrypoint.d ${{targets.contextdir}}/opt/entrypoints - - name: datadog-agent-core-integrations + - name: ${{package.name}}-core-integrations dependencies: + provides: + - datadog-agent-core-integrations=${{package.full-version}} runtime: - bash - busybox @@ -477,8 +495,10 @@ subpackages: done done - - name: datadog-cluster-agent + - name: datadog-cluster-agent-${{vars.major-minor-version}} dependencies: + provides: + - datadog-cluster-agent=${{package.full-version}} runtime: - tzdata - libseccomp @@ -501,8 +521,10 @@ subpackages: datadog-cluster-agent version datadog-cluster-agent --help - - name: datadog-cluster-agent-oci-compat + - name: datadog-cluster-agent-${{vars.major-minor-version}}-oci-compat dependencies: + provides: + - datadog-cluster-agent-oci-compat=${{package.full-version}} runtime: - bash - busybox @@ -525,8 +547,11 @@ subpackages: readlink -v /opt/datadog-agent/bin/agent readlink -v /opt/datadog-agent/bin/datadog-cluster-agent - - name: datadog-agent-fakeintake + - name: ${{package.name}}-fakeintake description: A fake intake server useful for testing purposes + dependencies: + provides: + - datadog-agent-fakeintake=${{package.full-version}} pipeline: - working-directory: test/fakeintake # This needs CGO_ENABLED=1, which we just so happen to inherit from the @@ -545,8 +570,11 @@ subpackages: # we don't want to maintain a package for. Instead, include the # raw release of that version of s6-overlay as a datadog-agent # subpackage, only to be used by image builders. - - name: datadog-agent-s6-overlay + - name: ${{package.name}}-s6-overlay description: "Deprecated s6-overlay for datadog-agent" + dependencies: + provides: + - datadog-agent-s6-overlay=${{package.full-version}} options: # Hide this from our SCA and dag, this package should _only_ ever be used by datadog-agent no-provides: true @@ -685,8 +713,10 @@ subpackages: command -v withstdinas >/dev/null && echo "withstdinas OK" || { echo "withstdinas FAIL" > /tmp/datadog-agent.log; exit 1; } - - name: dogstatsd + - name: dogstatsd-${{vars.major-minor-version}} dependencies: + provides: + - dogstatsd=${{package.full-version}} runtime: - busybox - netcat-openbsd @@ -713,9 +743,9 @@ test: environment: contents: packages: - - datadog-agent=${{package.full-version}} - - datadog-agent-fakeintake=${{package.full-version}} - - datadog-agent-core-integrations=${{package.full-version}} + - ${{package.name}}=${{package.full-version}} + - ${{package.name}}-fakeintake=${{package.full-version}} + - ${{package.name}}-core-integrations=${{package.full-version}} - mkcert environment: # cannot use vars.destd here. https://github.com/chainguard-dev/melange/issues/1402 @@ -802,5 +832,6 @@ update: enabled: true github: identifier: DataDog/datadog-agent + tag-filter: 7.72. ignore-regex-patterns: - "lambda-extension.*" diff --git a/datadog-agent/fix-7.66.0-ftbfs.patch b/datadog-agent-7.72/fix-7.66.0-ftbfs.patch similarity index 100% rename from datadog-agent/fix-7.66.0-ftbfs.patch rename to datadog-agent-7.72/fix-7.66.0-ftbfs.patch diff --git a/datadog-agent/int-core-datadog_checks_dev-pyproject-toml.patch b/datadog-agent-7.72/int-core-datadog_checks_dev-pyproject-toml.patch similarity index 100% rename from datadog-agent/int-core-datadog_checks_dev-pyproject-toml.patch rename to datadog-agent-7.72/int-core-datadog_checks_dev-pyproject-toml.patch diff --git a/datadog-agent/int-core-mysql-hatch-toml.patch b/datadog-agent-7.72/int-core-mysql-hatch-toml.patch similarity index 100% rename from datadog-agent/int-core-mysql-hatch-toml.patch rename to datadog-agent-7.72/int-core-mysql-hatch-toml.patch diff --git a/datadog-agent/int-core-singlestore-hatch-toml.patch b/datadog-agent-7.72/int-core-singlestore-hatch-toml.patch similarity index 100% rename from datadog-agent/int-core-singlestore-hatch-toml.patch rename to datadog-agent-7.72/int-core-singlestore-hatch-toml.patch