[DBMON-6784] Fix Clickhouse database_hostname usage#24247
Merged
Conversation
🎉 All green!🧪 All tests passed 🔗 Commit SHA: 03e5995 | Docs | Datadog PR Page | Give us feedback! |
Contributor
Validation ReportAll 21 validations passed. Show details
|
sethsamuel
approved these changes
Jun 29, 2026
sangeetashivaji
approved these changes
Jun 29, 2026
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
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.
What does this PR do?
Adds a dedicated
database_hostnameproperty to the ClickHouse check and uses it for thedatabase_hostnametag and the database-instance metadata, instead of reusingreported_hostname.The new property always resolves the underlying database host via
resolve_db_host(server), independent of thereported_hostnameconfig override, and is cached. This mirrors thedatabase_hostnameconvention already implemented in the Postgres, MySQL, and SQL Server integrations.Changes:
database_hostnameproperty (initialized in__init__).database_hostnamecore tag (_add_core_tags) and thedatabase_hostnamemetadata field (_send_database_instance_metadata) fromself.database_hostnamerather thanself.reported_hostname.check.database_hostname.Motivation
ClickHouse conflated
database_hostnamewithreported_hostname. When a user set thereported_hostnameconfig override, thedatabase_hostnametag and metadata incorrectly became that override value instead of the true resolved host.database_hostnameis meant to be a stable identifier of the underlying DB host used to correlate DBM data, so this broke correlation and diverged from the behavior of the other DBM integrations.Review checklist (to be filled by reviewers)
qa/requiredif this PR needs QA validation, orqa/skip-qaif it does not. Exactly one of the two is required.backport/<branch-name>label to the PR and it will automatically open a backport PR once this one is merged