From cd4b5ec617e6cc28a7f20db4ec06d1952aa93e4d Mon Sep 17 00:00:00 2001 From: Noueman Khalikine Date: Mon, 21 Oct 2024 16:11:07 +0200 Subject: [PATCH 1/6] release 4.19.0 --- CHANGELOG.md | 1 + packages/dd-agent/packaging | 2 +- packages/dd-agent/spec | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cecf120..0a971f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 4.18.0 / 2024-05-29 +* [Added] Bump embedded Datadog Agent version to 7.57.0. Read more about it [here](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst#7570--6570). * [Added] Bump embedded Datadog Agent version to 7.53.0. Read more about it [here](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst#7530--6530). * [Added] Automatically detect the Agent embedded Python version. See [#213](https://github.com/DataDog/datadog-agent-boshrelease/pull/213). diff --git a/packages/dd-agent/packaging b/packages/dd-agent/packaging index 13bf06e..3445ebb 100644 --- a/packages/dd-agent/packaging +++ b/packages/dd-agent/packaging @@ -7,7 +7,7 @@ set -e -x # Grab the latest versions that are in the directory -DD_AGENT_VERSION=7.53.0 +DD_AGENT_VERSION=7.57.0 JOB_NAME="dd-agent" BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages} diff --git a/packages/dd-agent/spec b/packages/dd-agent/spec index dcd97c2..e076058 100644 --- a/packages/dd-agent/spec +++ b/packages/dd-agent/spec @@ -2,7 +2,7 @@ name: dd-agent files: -- dd-agent/datadog-agent_7.53.0-1_amd64.deb # https://s3.amazonaws.com/apt.datadoghq.com/pool/d/da/datadog-agent_7.53.0-1_amd64.deb -- dd-agent/datadog-agent-7.53.0-1.x86_64.rpm # https://s3.amazonaws.com/yum.datadoghq.com/stable/7/x86_64/datadog-agent-7.53.0-1.x86_64.rpm +- dd-agent/datadog-agent_7.57.0-1_amd64.deb # https://s3.amazonaws.com/apt.datadoghq.com/pool/d/da/datadog-agent_7.57.0-1_amd64.deb +- dd-agent/datadog-agent-7.57.0-1.x86_64.rpm # https://s3.amazonaws.com/yum.datadoghq.com/stable/7/x86_64/datadog-agent-7.57.0-1.x86_64.rpm - helpers/**/* - checks.d/**/* \ No newline at end of file From ed173725a34acf5067c4f8c25558359a51de1476 Mon Sep 17 00:00:00 2001 From: Noueman Khalikine Date: Mon, 21 Oct 2024 16:17:21 +0200 Subject: [PATCH 2/6] release 4.19.0 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a971f3..090d3a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 4.19.0 / 2024-10-21 + +* [Added] Bump embedded Datadog Agent version to 7.57.0. Read more about it [here](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst#7570--6570). +* [Added] Enable installing extra integrations not included in Agent package. See [#217](https://github.com/DataDog/datadog-agent-boshrelease/pull/217). Thanks [wpt1313](https://github.com/wpt1313). +* [Fixed] Fix `2to3` broken symlink. See [#218](https://github.com/DataDog/datadog-agent-boshrelease/pull/218). + ## 4.18.0 / 2024-05-29 * [Added] Bump embedded Datadog Agent version to 7.57.0. Read more about it [here](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst#7570--6570). From 3f65b3f96d6b5c542ca949889b8fadb9b28eb578 Mon Sep 17 00:00:00 2001 From: NouemanKHAL Date: Mon, 21 Oct 2024 16:40:52 +0200 Subject: [PATCH 3/6] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 090d3a5..a632d44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,6 @@ ## 4.18.0 / 2024-05-29 -* [Added] Bump embedded Datadog Agent version to 7.57.0. Read more about it [here](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst#7570--6570). * [Added] Bump embedded Datadog Agent version to 7.53.0. Read more about it [here](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst#7530--6530). * [Added] Automatically detect the Agent embedded Python version. See [#213](https://github.com/DataDog/datadog-agent-boshrelease/pull/213). From 64e5f2d777378e0fa0f7087c965c83f119d5718a Mon Sep 17 00:00:00 2001 From: Noueman Khalikine Date: Mon, 21 Oct 2024 20:42:42 +0200 Subject: [PATCH 4/6] bump datadog-agent-buildimages version --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index beaa237..20d58a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ variables: agent-bosh-prod-release: stage: deploy - image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/gitlab_agent_deploy:v34815905-ae40295e + image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/gitlab_agent_deploy:v45979046-89a73a40 tags: ["runner:main"] when: manual script: From df50fe7ca144194d18e067de5daeba76a0abe371 Mon Sep 17 00:00:00 2001 From: robot-github-intg-tools Date: Mon, 21 Oct 2024 18:46:45 +0000 Subject: [PATCH 5/6] releases datadog agent 4.19.0 --- .final_builds/jobs/dd-agent/index.yml | 4 ++++ .final_builds/packages/dd-agent/index.yml | 4 ++++ config/blobs.yml | 8 +++++++ .../datadog-agent/datadog-agent-4.19.0.yml | 21 +++++++++++++++++++ releases/datadog-agent/index.yml | 2 ++ 5 files changed, 39 insertions(+) create mode 100644 releases/datadog-agent/datadog-agent-4.19.0.yml diff --git a/.final_builds/jobs/dd-agent/index.yml b/.final_builds/jobs/dd-agent/index.yml index 49de534..fc55479 100644 --- a/.final_builds/jobs/dd-agent/index.yml +++ b/.final_builds/jobs/dd-agent/index.yml @@ -183,6 +183,10 @@ builds: version: f52346e55015d10b4d1e2aceaca8c38796559f1e blobstore_id: b25f7233-c3da-436f-5cb8-4ddc8e2149a9 sha1: acd29b0f8ad847247b73524ce5c06e5976e2a769 + fd7557b4dd79032655c6575e47db4f6aed57131944f1bf73ea37ad90d1fcf7ee: + version: fd7557b4dd79032655c6575e47db4f6aed57131944f1bf73ea37ad90d1fcf7ee + blobstore_id: 8e9b1ac3-e804-429b-4113-29dc14ac9ead + sha1: sha256:0505721fa1c448c2e4a2d890aadc5192896c40034cbbea14a3591268f056afcf fdcffa29e33f109b650696f50f415fd75d8e31cb: version: fdcffa29e33f109b650696f50f415fd75d8e31cb blobstore_id: 1f7e6cc7-acb7-4ca1-5a53-54465c209d50 diff --git a/.final_builds/packages/dd-agent/index.yml b/.final_builds/packages/dd-agent/index.yml index 85a435b..0e22f4d 100644 --- a/.final_builds/packages/dd-agent/index.yml +++ b/.final_builds/packages/dd-agent/index.yml @@ -87,6 +87,10 @@ builds: version: 4d9bc12da2c986b80a107b42182fd16f3a5a4199 blobstore_id: e684fdb5-c9c4-4b70-53f8-db895b67eb6f sha1: 2d9a0c9127d1f7fb10d0ea2812df47ab53cb2794 + 4f87e472b6a1e35ad71a67a04483fdc131fd83d95fb0aa324df780791320619f: + version: 4f87e472b6a1e35ad71a67a04483fdc131fd83d95fb0aa324df780791320619f + blobstore_id: b457dbcb-4292-4349-7988-0eeafa67dc5d + sha1: sha256:84840325042e488396edbfb5c5b8d1172e376642669167dc2a0e954b4fef8941 578828d25a3d508cef6d697471ba55b6cf598107: version: 578828d25a3d508cef6d697471ba55b6cf598107 blobstore_id: ca5bb416-2377-4da9-58df-7ca7bee2838d diff --git a/config/blobs.yml b/config/blobs.yml index 846ff56..8008f20 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -10,6 +10,10 @@ dd-agent/datadog-agent-7.53.0-1.x86_64.rpm: size: 266742468 object_id: e0bfb0e0-310a-40cf-7e2b-81c334217577 sha: sha256:7f7aadfa214b1f6baa8aa437b017ea6a85d942814ea0cc4c87283a67d1f3e616 +dd-agent/datadog-agent-7.57.0-1.x86_64.rpm: + size: 277175140 + object_id: 231aff29-f232-4299-7529-01ab7408dd8d + sha: sha256:8bebeaac47f5747457d0182f95bb98cc8a465ff7688f93fa4180c133b86793cb dd-agent/datadog-agent_7.48.0-1_amd64.deb: size: 404537878 object_id: e9107e4b-dd25-415e-5487-aebef474469f @@ -22,3 +26,7 @@ dd-agent/datadog-agent_7.53.0-1_amd64.deb: size: 268696382 object_id: 1ee95782-11e9-40ad-459f-ffb57a42a39c sha: sha256:b06f257501e8db7742b44c12563bc91b262b9e67689b32752f1efd1c30c9f802 +dd-agent/datadog-agent_7.57.0-1_amd64.deb: + size: 279665940 + object_id: 6e51dff6-3634-44fa-6d93-a93e1f957f98 + sha: sha256:a9beb58c51d74a1c4b3f117a67d85356522ad230baa5cbec72791625459e5169 diff --git a/releases/datadog-agent/datadog-agent-4.19.0.yml b/releases/datadog-agent/datadog-agent-4.19.0.yml new file mode 100644 index 0000000..24e0d69 --- /dev/null +++ b/releases/datadog-agent/datadog-agent-4.19.0.yml @@ -0,0 +1,21 @@ +name: datadog-agent +version: 4.19.0 +commit_hash: 64e5f2d +uncommitted_changes: true +jobs: +- name: dd-agent + version: fd7557b4dd79032655c6575e47db4f6aed57131944f1bf73ea37ad90d1fcf7ee + fingerprint: fd7557b4dd79032655c6575e47db4f6aed57131944f1bf73ea37ad90d1fcf7ee + sha1: sha256:0505721fa1c448c2e4a2d890aadc5192896c40034cbbea14a3591268f056afcf + packages: + - dd-agent +packages: +- name: dd-agent + version: 4f87e472b6a1e35ad71a67a04483fdc131fd83d95fb0aa324df780791320619f + fingerprint: 4f87e472b6a1e35ad71a67a04483fdc131fd83d95fb0aa324df780791320619f + sha1: sha256:84840325042e488396edbfb5c5b8d1172e376642669167dc2a0e954b4fef8941 + dependencies: [] +license: + version: 3e1bfe6017d53b457ee5186e88c5d6f39858c4f2eabce9cb42ba984c78bb8130 + fingerprint: 3e1bfe6017d53b457ee5186e88c5d6f39858c4f2eabce9cb42ba984c78bb8130 + sha1: sha256:63bc7d4c34c00006c2b43a797f5b42221cbab4cd5cc0290e372beda913fab74f diff --git a/releases/datadog-agent/index.yml b/releases/datadog-agent/index.yml index 252e7b7..1ede017 100644 --- a/releases/datadog-agent/index.yml +++ b/releases/datadog-agent/index.yml @@ -91,6 +91,8 @@ builds: version: 4.11.1 8a025670-e8da-416d-5fe6-3d079e8b592b: version: 2.7.6100 + 93407dba-8f92-469b-5c48-a6e8ce122e9a: + version: 4.19.0 9a62e503-cb58-453f-51e8-bc79fede1bd8: version: 2.2.610 9a99bb5b-5374-4c51-47f0-1f360be41ab6: From 451d233a2acc14ea1d6b28e3b87c25ba29baea75 Mon Sep 17 00:00:00 2001 From: NouemanKHAL Date: Mon, 21 Oct 2024 20:58:12 +0200 Subject: [PATCH 6/6] Fix release notes link --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a632d44..b80ccb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 4.19.0 / 2024-10-21 -* [Added] Bump embedded Datadog Agent version to 7.57.0. Read more about it [here](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst#7570--6570). +* [Added] Bump embedded Datadog Agent version to 7.57.0. Read more about it [here](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst#7570). * [Added] Enable installing extra integrations not included in Agent package. See [#217](https://github.com/DataDog/datadog-agent-boshrelease/pull/217). Thanks [wpt1313](https://github.com/wpt1313). * [Fixed] Fix `2to3` broken symlink. See [#218](https://github.com/DataDog/datadog-agent-boshrelease/pull/218).