Sync conf.yaml.example/config models with ddev + fix redis get_default_config collision - #3127
Merged
Merged
Conversation
`ddev validate config`/`models` drift accumulated in these integrations because their generated files predate the ddev version CI now runs. Regenerated via `ddev validate config/models -s` using ddev 18.0.0 (the version pip installs unpinned in the Validate workflow). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
|
🎯 Code Coverage (details) 🔗 Commit SHA: 1a4a70e | Docs | View more details | Give us feedback! |
philjlee
changed the base branch from
master
to
philip.lee/fix-redis-openmetrics-default-config-collision
August 24, 2026 20:50
philjlee
force-pushed
the
philip.lee/fix-validate-config-models-drift
branch
from
August 24, 2026 20:50
28c2cc3 to
44277f1
Compare
philjlee
changed the base branch from
philip.lee/fix-redis-openmetrics-default-config-collision
to
master
August 24, 2026 20:57
philjlee
force-pushed
the
philip.lee/fix-validate-config-models-drift
branch
from
August 24, 2026 20:57
44277f1 to
28c2cc3
Compare
…_enterprise checks Both RedisCloudCheck and RedisEnterpriseCheck defined a get_default_config() method returning a list of metric groups. A newer datadog-checks-base adds its own get_default_config() to OpenMetricsBaseCheckV2, used internally by get_config_with_defaults() to seed scraper config from the generated config_models defaults (expects key/value pairs, not a metrics list). The override shadows the base method, so get_config_with_defaults() calls the check's version instead and dict() blows up trying to consume a list of metric dicts as key/value pairs. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
sarah-witt
approved these changes
Aug 25, 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
Regenerates
conf.yaml.exampleandconfig_models/{defaults,instance}.pyfor six integrations whose generated files had drifted out of sync with theddevversion CI now runs, and renames a collidingget_default_configmethod inredis_cloud/redis_enterprise.Why
Drift fix: The
Validateworkflow'spip install ddevis unpinned, so CI validates against whatever the latestddevrelease is (18.0.0 as of this PR), while these files were last regenerated with an olderddev. That mismatch has been failingddev validate config/ddev validate modelsonmasterfor a while — it's unrelated to any specific PR's content, but any PR that touches one of these directories (even just adding an unrelated file) drags the whole directory intoTARGET=changedscope and inherits the failure.Affected:
conf.yaml.example:ocient,qdrant,redis_cloud,redis_enterprise,redpandaconfig_models:mergify,ocient,qdrant,redis_cloud,redis_enterpriseMethod collision fix:
OpenMetricsBaseCheckV2.get_config_with_defaults()in a newerdatadog_checks_basecallsself.get_default_config()to seed scraper config from generated model defaults.RedisCloudCheck/RedisEnterpriseCheckeach pre-existing define their own unrelatedget_default_config()(returns default metric groups), which shadows the base class's method and causesValueError: dictionary update sequence element #0 has length N; 2 is requiredat check init. Renamed both toget_default_metricsto remove the collision — this is a pre-existing bug, unrelated to the drift fix above, but it also lives inredis_cloud/redis_enterpriseand hits the sameTARGET=changedscoping problem, so it's combined into this PR rather than split into a separate one (see note below).How
ddev validate config <check> -s/ddev validate models <check> -susingddev18.0.0 (matching CI), verified each is back in sync. No manual edits — every changed file is fully autogenerated fromassets/configuration/spec.yaml.get_default_config→get_default_metricsinredis_cloud/datadog_checks/redis_cloud/check.pyandredis_enterprise/datadog_checks/redis_enterprise/check.py, updating the one call site in each. Verified locally withddev test redis_cloud/redis_enterprise(5/5, 7/7 passing) andddev validate config/modelsfor both, usingddev18.0.0.Note
This PR was originally split into two (this drift fix, plus a separate PR renaming the colliding method). Both touch the same
redis_cloud/redis_enterprisedirectories, so under CI'sTARGET=changedscoping neither could pass independently — whichever one didn't carry the other's fix would fail on the other's pre-existing bug when checked standalone. Combined them here; the separate rename PR (#3128) is closed as superseded.This PR unblocks #3095 (TXP-277 dataflows.yaml backfill, batch 2), which is stacked on top of this branch.
🤖 Generated with Claude Code