[ABLD-27] Prepare deployment of Agent v7.70+ for macOS (arm64/x86_64)#664
Merged
rdesgroppes merged 4 commits intoDataDog:mainfrom Oct 8, 2025
rdesgroppes:regis.desgroppes/prepare-deployment-of-agent-7.70+-for-macos-on-arm64
Merged
[ABLD-27] Prepare deployment of Agent v7.70+ for macOS (arm64/x86_64)#664rdesgroppes merged 4 commits intoDataDog:mainfrom rdesgroppes:regis.desgroppes/prepare-deployment-of-agent-7.70+-for-macos-on-arm64
rdesgroppes merged 4 commits intoDataDog:mainfrom
rdesgroppes:regis.desgroppes/prepare-deployment-of-agent-7.70+-for-macos-on-arm64
Conversation
25 tasks
buraizu
approved these changes
Jul 23, 2025
rdesgroppes
changed the title
rdesgroppes
changed the title
This draft change is meant to share how upcoming agent deliverables for macOS will embed architecture qualifiers (name & metadata) starting from version 7.70 and some of the practical implications. A word of caution: I'm far from being fluent with `ansible`, let alone with the local setup and conventions, so the change is unlikely to work out of the box not to be exhaustive. Following upstream changes might be of interest to reviewers: - architecture qualifiers: - DataDog/omnibus-ruby#240 - DataDog/agent-release-management#364 - new build for AArch64/ARM64: - DataDog/datadog-agent#37676 - DataDog/agent-release-management#365
rdesgroppes
changed the title
rdesgroppes
changed the title
Altogether: - use method `GET` w/ `return_content: false` instead of `HEAD` (not necessarily implemented) - move `uri`-unsupported `retries` to upper level - pass `status_code: 200` to populate `datadog_macos_agent7_latest_arch_check.status` - make `ansible-lint` happy (at the expense of readability)
fanny-jiang
approved these changes
Oct 7, 2025
Contributor
fanny-jiang
left a comment
fanny-jiang
left a comment
There was a problem hiding this comment.
Looks good, just needs that one small change. Thanks!
To prevent an undefined variable error. Co-authored-by: Fanny Jiang <fanny.jiang@datadoghq.com>
Use a folded block scalar to overcome the 160-char line limitation.
rdesgroppes
deleted the
regis.desgroppes/prepare-deployment-of-agent-7.70+-for-macos-on-arm64
branch
rdesgroppes
added a commit
that referenced
this pull request
Oct 8, 2025
After merging #664, I realized the change I introduced to a table could be misinterpreted as suggesting that users should set `datadog_agent_major_version` to values like `7.69-` or `7.70+`, when in fact only `6` or `7` are valid inputs: >>> When the variable `datadog_macos_download_url` is not set, the official macOS DMG package corresponding to the `datadog_agent_major_version` is used: | Agent version | Default macOS DMG package URL | |-----------------------|-----------------------------------------------------------------| | 6 | https://install.datadoghq.com/datadog-agent-6-latest.dmg | | 7.69- | https://install.datadoghq.com/datadog-agent-7-latest.dmg | | 7.70+ (Intel Mac) | https://install.datadoghq.com/datadog-agent-7-latest.x86_64.dmg | | 7.70+ (Apple Silicon) | https://install.datadoghq.com/datadog-agent-7-latest.arm64.dmg | >>> Inspired by its [former content](https://github.com/DataDog/ansible-datadog/blob/e8eb1616e897639c52260cc801439d5bbe7c43df/README.md#macos), the proposed table aims at preventing confusion by separating user-provided configuration values from automatic resolution logic (where version ranges like `7.69-` or `7.70+` are informational only): >>> | Agent version | Default macOS DMG package URL | |---------------|---------------------------------------------------------------------------------------| | 6 | https://install.datadoghq.com/datadog-agent-6-latest.dmg | | 7 | https://install.datadoghq.com/datadog-agent-7-latest.dmg (7.69-) | | | https://install.datadoghq.com/datadog-agent-7-latest.x86_64.dmg (7.70+, Intel Mac) | | | https://install.datadoghq.com/datadog-agent-7-latest.arm64.dmg (7.70+, Apple Silicon) | >>>
rdesgroppes
added a commit
that referenced
this pull request
Oct 8, 2025
After merging #664, I realized the change I introduced to a table could be misinterpreted as suggesting that users should set `datadog_agent_major_version` to values like `7.69-` or `7.70+`, when in fact only `6` or `7` are valid inputs: > When the variable `datadog_macos_download_url` is not set, the official macOS DMG package corresponding to the `datadog_agent_major_version` is used: > > | Agent version | Default macOS DMG package URL | > |-----------------------|-----------------------------------------------------------------| > | 6 | https://install.datadoghq.com/datadog-agent-6-latest.dmg | > | 7.69- | https://install.datadoghq.com/datadog-agent-7-latest.dmg | > | 7.70+ (Intel Mac) | https://install.datadoghq.com/datadog-agent-7-latest.x86_64.dmg | > | 7.70+ (Apple Silicon) | https://install.datadoghq.com/datadog-agent-7-latest.arm64.dmg | Inspired by its [former content](https://github.com/DataDog/ansible-datadog/blob/e8eb1616e897639c52260cc801439d5bbe7c43df/README.md#macos), the proposed table aims at preventing confusion by separating user-provided configuration values from automatic resolution logic (where version ranges like `7.69-` or `7.70+` are informational only): | Agent version | Default macOS DMG package URL | |---------------|---------------------------------------------------------------------------------------| | 6 | https://install.datadoghq.com/datadog-agent-6-latest.dmg | | 7 | https://install.datadoghq.com/datadog-agent-7-latest.dmg (7.69-) | | | https://install.datadoghq.com/datadog-agent-7-latest.x86_64.dmg (7.70+, Intel Mac) | | | https://install.datadoghq.com/datadog-agent-7-latest.arm64.dmg (7.70+, Apple Silicon) |
rdesgroppes
added a commit
that referenced
this pull request
Oct 8, 2025
After merging #664, I realized the change I introduced to a table could be misinterpreted as suggesting that users should set `datadog_agent_major_version` to values like `7.69-` or `7.70+`, when in fact only `6` or `7` are valid inputs: > When the variable `datadog_macos_download_url` is not set, the official macOS DMG package corresponding to the `datadog_agent_major_version` is used: > > | Agent version | Default macOS DMG package URL | > |-----------------------|-----------------------------------------------------------------| > | 6 | https://install.datadoghq.com/datadog-agent-6-latest.dmg | > | 7.69- | https://install.datadoghq.com/datadog-agent-7-latest.dmg | > | 7.70+ (Intel Mac) | https://install.datadoghq.com/datadog-agent-7-latest.x86_64.dmg | > | 7.70+ (Apple Silicon) | https://install.datadoghq.com/datadog-agent-7-latest.arm64.dmg | Close to its [former state](https://github.com/DataDog/ansible-datadog/blob/e8eb1616e897639c52260cc801439d5bbe7c43df/README.md#macos), the proposed table aims at preventing confusion by separating user-provided configuration values from automatic resolution logic (where version ranges like `7.69-` or `7.70+` are informational only): > | Agent version | Default macOS DMG package URL | > |---------------|---------------------------------------------------------------------------------------| > | 6 | https://install.datadoghq.com/datadog-agent-6-latest.dmg | > | 7 | https://install.datadoghq.com/datadog-agent-7-latest.dmg (7.69-) | > | | https://install.datadoghq.com/datadog-agent-7-latest.x86_64.dmg (7.70+, Intel Mac) | > | | https://install.datadoghq.com/datadog-agent-7-latest.arm64.dmg (7.70+, Apple Silicon) |
Collaborator
Author
swang392
pushed a commit
that referenced
this pull request
Oct 8, 2025
After merging #664, I realized the change I introduced to a table could be misinterpreted as suggesting that users should set `datadog_agent_major_version` to values like `7.69-` or `7.70+`, when in fact only `6` or `7` are valid inputs: > When the variable `datadog_macos_download_url` is not set, the official macOS DMG package corresponding to the `datadog_agent_major_version` is used: > > | Agent version | Default macOS DMG package URL | > |-----------------------|-----------------------------------------------------------------| > | 6 | https://install.datadoghq.com/datadog-agent-6-latest.dmg | > | 7.69- | https://install.datadoghq.com/datadog-agent-7-latest.dmg | > | 7.70+ (Intel Mac) | https://install.datadoghq.com/datadog-agent-7-latest.x86_64.dmg | > | 7.70+ (Apple Silicon) | https://install.datadoghq.com/datadog-agent-7-latest.arm64.dmg | Close to its [former state](https://github.com/DataDog/ansible-datadog/blob/e8eb1616e897639c52260cc801439d5bbe7c43df/README.md#macos), the proposed table aims at preventing confusion by separating user-provided configuration values from automatic resolution logic (where version ranges like `7.69-` or `7.70+` are informational only): > | Agent version | Default macOS DMG package URL | > |---------------|---------------------------------------------------------------------------------------| > | 6 | https://install.datadoghq.com/datadog-agent-6-latest.dmg | > | 7 | https://install.datadoghq.com/datadog-agent-7-latest.dmg (7.69-) | > | | https://install.datadoghq.com/datadog-agent-7-latest.x86_64.dmg (7.70+, Intel Mac) | > | | https://install.datadoghq.com/datadog-agent-7-latest.arm64.dmg (7.70+, Apple Silicon) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This change is meant to take into account how agent deliverables for macOS embed architecture qualifiers (name & metadata) starting from version 7.70 and some of the practical implications.
A word of caution: I'm far from being fluent with
ansible, let alone with the local setup and conventions, so the change is unlikely to work out of the box nor to be exhaustive.Following upstream changes might be of interest to reviewers: